[Pkg-samba-maint] r863 - branches/samba4

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-04 01:27:41 +0000 (Wed, 04 Jan 2006)
New Revision: 863

Modified:
   branches/samba4/changelog
   branches/samba4/samba.postinst
Log:
Doh, don't provision on upgrades from Samba 4. More correct code, fewer
lines. :-P


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-04 01:16:37 UTC (rev 862)
+++ branches/samba4/changelog	2006-01-04 01:27:41 UTC (rev 863)
@@ -17,7 +17,7 @@
       if relevant.
     * Check for upgrade from << 3.9.0 in postinst, and upgrade if the user
       wished to.
-  * Only provision in samba.postinst if we're being called with "configure".
+  * Only provision in samba.postinst if we're doing a fresh install.
   * Make samba-client Replaces/Conflicts smbclient.
   * Rename samba-swat to swat, and add a dependency from swat to samba.
   * Change debhelper compatibility level to 5.

Modified: branches/samba4/samba.postinst
===================================================================
--- branches/samba4/samba.postinst	2006-01-04 01:16:37 UTC (rev 862)
+++ branches/samba4/samba.postinst	2006-01-04 01:27:41 UTC (rev 863)
@@ -6,20 +6,16 @@
 
 if [ "$1" = "configure" ]; then
 	# See if we're upgrading from Samba 3
-	UPGRADE_FROM_V3=
 	if [ ! -z "$2" ]; then
 		if dpkg --compare-versions "$2" lt "3.9.0"; then
 			db_get samba/upgrade-from-v3 || true
 			if [ "$RET" = "true" ]; then
-				UPGRADE_FROM_V3=yes
 				mv /etc/samba/smb.conf /etc/samba/smb.conf.samba3
 				/usr/lib/samba/setup/upgrade /var/lib/samba /etc/samba/smb.conf.samba3
 				db_stop
 			fi
 		fi
-	fi
-
-	if [ -z "$UPGRADE_FROM_V3" ]; then
+	else
 		db_get samba/setup-pdc || true
 
 		if [ "$RET" = "true" ]; then