From 6cf1b0c07c819e9e2afdcb87b2e4fd31ed680b72 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 30 Aug 2005 12:27:53 +0000
Subject: r9793: Be more verbose, check for errors in upgrade script. (This
 used to be commit b7c09df9e506f8048f69c4bdd1c3351e3b554e18)

---
 source4/setup/upgrade | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source4/setup')

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;
-- 
cgit