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

[vorlon at alioth.debian.org]

tags 593965 pending
thanks

Author: vorlon
Date: 2010-09-13 06:36:52 +0000 (Mon, 13 Sep 2010)
New Revision: 1330

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.scripts-common
Log:
debian/slapd.scripts-common: don't run the migration code if slapd.d
already exists.  Closes: #593965.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-09-13 06:24:21 UTC (rev 1329)
+++ openldap/trunk/debian/changelog	2010-09-13 06:36:52 UTC (rev 1330)
@@ -37,6 +37,8 @@
     works as intended.  Closes: #596049.
   * debian/slapd.init.ldif: synchronize our behavior on new installs with
     that on upgrades, avoiding the non-standard cn=localroot,cn=config.
+  * debian/slapd.scripts-common: don't run the migration code if slapd.d
+    already exists.  Closes: #593965.
 
   [ 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-13 06:24:21 UTC (rev 1329)
+++ openldap/trunk/debian/slapd.scripts-common	2010-09-13 06:36:52 UTC (rev 1330)
@@ -112,7 +112,9 @@
 migrate_to_slapd_d_style() {				# {{{
 
 	# Check if we need to migrate to the new style.
-	if previous_version_older 2.4.23-3 || [ -f "${SLAPD_CONF}" ]; then
+	if previous_version_older 2.4.23-3 && [ -f "${SLAPD_CONF}" ] \
+	   && ! [ -d /etc/ldap/slapd.d ]
+	then
 
 		# Create the new configuration directory
 		mkdir /etc/ldap/slapd.d