From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Dec 2007 02:00:48 +0000 (+0100)
Subject: r26303: Fix up error reporting during the delete of previous entries in the
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=1fb8c31a3da6fc07f55027f05dba5e03dcf8a4f7;p=jelmer%2Fsamba4-debian.git

r26303: Fix up error reporting during the delete of previous entries in the

provision, and ignore 'no such entry' as an error (it is normal, and
just means the partition is compleatly empty).

Andrew Bartlett
---

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index e7e844bb8..5e9e43a85 100644
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -224,7 +224,10 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 			var res2 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			var i;
 			if (res2.error != 0) {
-				info.message("ldb search failed: " + res.errstr + "\n");
+				if (res2.error == 32) {
+					break;
+				}
+				info.message("ldb search failed: " + res2.errstr + "\n");
 				continue;
 			}
 			previous_remaining = current_remaining;
@@ -235,7 +238,7 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 			
 			var res3 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			if (res3.error != 0) {
-				info.message("ldb search failed: " + res.errstr + "\n");
+				info.message("ldb search failed: " + res3.errstr + "\n");
 				continue;
 			}
 			if (res3.msgs.length != 0) {