[Pkg-openldap-devel] r1323 - openldap/trunk/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2010-09-12 22:46:27 +0000 (Sun, 12 Sep 2010)
New Revision: 1323

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.scripts-common
Log:
debian/slapd.scripts-common: ... and do the same in
migrate_to_slapd_d_style, we just need to comment out the user's
previous entry instead of blowing it away.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-09-12 22:44:07 UTC (rev 1322)
+++ openldap/trunk/debian/changelog	2010-09-12 22:46:27 UTC (rev 1323)
@@ -18,6 +18,9 @@
   * debian/slapd.default: now that we have a sensible default behavior in
     both slapd.init and the maintainer scripts, leave SLAPD_CONF empty to
     save pain later.
+  * debian/slapd.scripts-common: ... and do the same in
+    migrate_to_slapd_d_style, we just need to comment out the user's
+    previous entry instead of blowing it away.
 
   [ Matthijs Mohlmann ]
   * Remove upgrade_supported_from_backend, implemented patch from

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2010-09-12 22:44:07 UTC (rev 1322)
+++ openldap/trunk/debian/slapd.scripts-common	2010-09-12 22:46:27 UTC (rev 1323)
@@ -142,7 +142,7 @@
 
 		# TODO: Now we are doing something that is not allowed by policy but it
 		# has to be done.
-		sed -i -e "s|^SLAPD_CONF=.*|SLAPD_CONF=\"${SLAPD_CONF}\"|" /etc/default/slapd
+		sed -i -e "/^[[:space:]]*SLAPD_CONF=.*/ s/^/#/" /etc/default/slapd
 		echo "done." >&2
 	fi
 }