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

[Steve Langasek]

Author: vorlon
Date: 2008-01-25 00:21:31 +0000 (Fri, 25 Jan 2008)
New Revision: 1008

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.postinst
   openldap/trunk/debian/slapd.scripts-common
Log:
* Fix an oversight in the checkpoint migration, which caused the checkpoint
  option to not be moved far enough down.  Closes: #462304, LP: #185257.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-01-23 18:08:02 UTC (rev 1007)
+++ openldap/trunk/debian/changelog	2008-01-25 00:21:31 UTC (rev 1008)
@@ -1,12 +1,15 @@
 openldap2.3 (2.4.7-4) UNRELEASED; urgency=low
 
+  [ Steve Langasek ]
   * Build-conflict with libicu-dev, for consistent dependencies in all
     build environments.
+  * Fix an oversight in the checkpoint migration, which caused the checkpoint
+    option to not be moved far enough down.  Closes: #462304, LP: #185257.
 
   [ Updated debconf translations ]
   * Japanese, thanks to Kenshi Muto <kmuto at debian.org>.  Closes: #462191.
 
- -- Steve Langasek <vorlon at debian.org>  Wed, 23 Jan 2008 05:44:03 -0800
+ -- Steve Langasek <vorlon at debian.org>  Thu, 24 Jan 2008 16:13:18 -0800
 
 openldap2.3 (2.4.7-3) unstable; urgency=low
 

Modified: openldap/trunk/debian/slapd.postinst
===================================================================
--- openldap/trunk/debian/slapd.postinst	2008-01-23 18:08:02 UTC (rev 1007)
+++ openldap/trunk/debian/slapd.postinst	2008-01-25 00:21:31 UTC (rev 1008)
@@ -43,7 +43,7 @@
 		fi
 	fi
 
-	if previous_version_older 2.4.7-1; then
+	if previous_version_older 2.4.7-4; then
 		if ! migrate_checkpoint_and_slurpd; then
 			db_input critical slapd/slurpd_obsolete || true
 			db_go || true

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2008-01-23 18:08:02 UTC (rev 1007)
+++ openldap/trunk/debian/slapd.scripts-common	2008-01-25 00:21:31 UTC (rev 1008)
@@ -437,6 +437,7 @@
 
 		$has_replica = 0;
 		$backend_bdb = $backend_hdb = 0;
+		$in_bdb = $in_hdb = 0;
 		$checkpoint_bdb = "";
 		$checkpoint_hdb = "";
 
@@ -462,17 +463,21 @@
 				$backend_bdb = 1 if (/^backend\s+bdb/);
 				$backend_hdb = 1 if (/^backend\s+hdb/);
 				if (/^checkpoint\s+/) {
-					$checkpoint_bdb = $_ if ($backend_bdb);
-					$checkpoint_hdb = $_ if ($backend_hdb);
-					next if ($backend_bdb || $backend_hdb);
+					$checkpoint_bdb = $_ if ($backend_bdb || $in_bdb);
+					$checkpoint_hdb = $_ if ($backend_hdb || $in_bdb);
+					next if ($backend_bdb || $backend_hdb || $in_bdb || $in_hdb);
 				}
-				if (/^database\s+bdb/)
+				$in_bdb = 1 if /^database\s+bdb/;
+				$in_hdb = 1 if /^database\s+hdb/;
+				if (/^suffix/ && $in_bdb)
 				{
+					$in_bdb = 0;
 					print $fh $_ . $checkpoint_bdb;
 					next;
 				}
-				if (/^database\s+hdb/)
+				if (/^suffix/ && $in_hdb)
 				{
+					$in_hdb = 0;
 					print $fh $_ . $checkpoint_hdb;
 					next;
 				}