[Pkg-samba-maint] r4034 - trunk/samba/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2012-03-10 18:38:36 +0000 (Sat, 10 Mar 2012)
New Revision: 4034

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba-common.postinst
Log:
* Merge some Ubuntu patches:
  - samba.config: Avoid scary pdbedit warnings on first import.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-03-10 18:25:19 UTC (rev 4033)
+++ trunk/samba/debian/changelog	2012-03-10 18:38:36 UTC (rev 4034)
@@ -6,6 +6,8 @@
     (thanks, backports!)
   * Lower priority of debconf question to medium after some pondering.
     After all, we have a sane default. Closes: #662801
+  * Merge some Ubuntu patches:
+    - samba.config: Avoid scary pdbedit warnings on first import.
 
   [ Maarten Bezemer ]
   * Removed references to the testprns command from documentation

Modified: trunk/samba/debian/samba-common.postinst
===================================================================
--- trunk/samba/debian/samba-common.postinst	2012-03-10 18:25:19 UTC (rev 4033)
+++ trunk/samba/debian/samba-common.postinst	2012-03-10 18:38:36 UTC (rev 4034)
@@ -98,9 +98,15 @@
 fi
 
 ucf --three-way --debconf-ok "$NEWFILE" "$CONFIG"
-ucfr samba-common "$CONFIG"
 
-chmod a+r "$CONFIG"
+if [ ! -e "$CONFIG" ]; then
+	echo "Install/upgrade will fail. To recover, please try:"
+	echo " sudo cp /usr/share/samba/smb.conf $CONFIG"
+	echo " sudo dpkg --configure -a"
+else
+	ucfr samba-common "$CONFIG"
+	chmod a+r "$CONFIG"
+fi
 
 # ------------------------- Debconf questions end ---------------------