r9793: Be more verbose, check for errors in upgrade script.

[jra/samba/.git] / source4 / setup / upgrade

diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index fed09f2a4e53f5b970dad7952aa7f1a9a7c5d8ac..22090b8cc673dcf2d42256e0d5ecf73d2067b31a 100755 (executable)
--- a/source4/setup/upgrade
+++ b/source4/setup/upgrade
@@ -81,8 +81,10 @@ message("Provisioning\n");
 var subobj = upgrade_provision(samba3);
 provision(subobj, message, options.blank);
 
-ok = upgrade(subobj,samba3,message);
-assert(ok);
-
-message("All OK\n");
+var ret = upgrade(subobj,samba3,message);
+if (ret > 0) {
+       message("Failed to import %d entries\n", ret);
+} else {
+       message("All OK\n");
+}
 return 0;