summaryrefslogtreecommitdiff
path: root/source4/setup/upgrade
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-30 12:27:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:35:02 -0500
commit6cf1b0c07c819e9e2afdcb87b2e4fd31ed680b72 (patch)
tree3bd8443bcd179871e6a887f1aafeb6de064816f5 /source4/setup/upgrade
parentb674411eb46c9e45f2740a1f9bac365e9a347e9c (diff)
downloadsamba-6cf1b0c07c819e9e2afdcb87b2e4fd31ed680b72.tar.gz
samba-6cf1b0c07c819e9e2afdcb87b2e4fd31ed680b72.tar.bz2
samba-6cf1b0c07c819e9e2afdcb87b2e4fd31ed680b72.zip
r9793: Be more verbose, check for errors in upgrade script.
(This used to be commit b7c09df9e506f8048f69c4bdd1c3351e3b554e18)
Diffstat (limited to 'source4/setup/upgrade')
-rwxr-xr-xsource4/setup/upgrade10
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index fed09f2a4e..22090b8cc6 100755
--- 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;