r26304: More work to remove silly error printouts.

Andrew Bartlett
(This used to be commit ba23dac0319f7c5ad89e5d79174520892027afdd)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 5e9e43a858afb9b0e7a04c540a9ba8071ded7d70..a64fdb89776525efbb67ad95065b27fb29838844 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -226,9 +226,10 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
                        if (res2.error != 0) {
                                if (res2.error == 32) {
                                        break;
+                               } else {
+                                       info.message("ldb search(2) failed: " + res2.errstr + "\n");
+                                       continue;
                                }
-                               info.message("ldb search failed: " + res2.errstr + "\n");
-                               continue;
                        }
                        previous_remaining = current_remaining;
                        current_remaining = res2.msgs.length;
@@ -238,7 +239,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: " + res3.errstr + "\n");
+                               info.message("ldb search(3) failed: " + res3.errstr + "\n");
                                continue;
                        }
                        if (res3.msgs.length != 0) {