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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-03-08 23:55:26 +0000 (Sat, 08 Mar 2008)
New Revision: 1740

Modified:
   trunk/samba/debian/samba-common.postinst
Log:
To use ucf --three-way, the option has to be used for each invocation of ucf.



Modified: trunk/samba/debian/samba-common.postinst
===================================================================
--- trunk/samba/debian/samba-common.postinst	2008-03-08 23:36:59 UTC (rev 1739)
+++ trunk/samba/debian/samba-common.postinst	2008-03-08 23:55:26 UTC (rev 1740)
@@ -101,7 +101,7 @@
 
 	cp "$TEMPLATE" "$NEWFILE"
 	configure_smb_conf "$NEWFILE"
-	ucf --debconf-ok "$NEWFILE" "$CONFIG"
+	ucf --three-way --debconf-ok "$NEWFILE" "$CONFIG"
 fi
 
 cp /usr/share/samba/smb.conf "$NEWFILE"