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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-03-09 00:48:18 +0000 (Sun, 09 Mar 2008)
New Revision: 1742

Modified:
   trunk/samba/debian/samba-common.postinst
Log:
fix up the regular expression for dhcp include handling, so that removing
the entry gets us a diff-free upgrade



Modified: trunk/samba/debian/samba-common.postinst
===================================================================
--- trunk/samba/debian/samba-common.postinst	2008-03-09 00:25:16 UTC (rev 1741)
+++ trunk/samba/debian/samba-common.postinst	2008-03-09 00:48:18 UTC (rev 1742)
@@ -64,9 +64,11 @@
 }" "$CONFIG"
 	elif [ "$RET" != true ]; then
 		sed -i -e '
-			/^#[[:space:]]*If we receive WINS server info from DHCP, override the options above/d
-			/^#*[[:space:]]*include[[:space:]]*=[[:space:]]*/etc/samba/dhcp.conf/d
-		' "$CONFIG"
+		/^#[[:space:]]*If we receive WINS server info from DHCP, override the options above/d
+		/^#*[[:space:]]*include[[:space:]]*=[[:space:]]*\/etc\/samba\/dhcp.conf/,/[^[:space:]]/ {
+			/^#*[[:space:]]*include[[:space:]]*=[[:space:]]*\/etc\/samba\/dhcp.conf/d
+			/^[[:space:]]*$/d
+		}' "$CONFIG"
 	fi
 
 	if [ -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.23b-2 \