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

[Steve Langasek]

Author: vorlon
Date: 2008-01-11 04:53:18 +0000 (Fri, 11 Jan 2008)
New Revision: 971

Modified:
   openldap/trunk/debian/slapd.scripts-common
Log:
tighten regexps for 'checkpoint' migration, we don't care about lines with
leading spaces

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2008-01-11 04:51:34 UTC (rev 970)
+++ openldap/trunk/debian/slapd.scripts-common	2008-01-11 04:53:18 UTC (rev 971)
@@ -456,20 +456,20 @@
 						changeConfig($file) 
 					}
 				}
-				$backend_bdb = $backend_hdb = 0 if (/^\s+(backend|database)\s+/);
-				$backend_bdb = 1 if (/^\s*backend\s+bdb/);
-				$backend_hdb = 1 if (/^\s*backend\s+hdb/);
-				if (/^\s*checkpoint\s+/) {
+				$backend_bdb = $backend_hdb = 0 if (/^(backend|database)\s+/);
+				$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);
 				}
-				if (/^\s*database\s+bdb/)
+				if (/^database\s+bdb/)
 				{
 					print $fh $_ . $checkpoint_bdb;
 					next;
 				}
-				if (/^\s*database\s+hdb/)
+				if (/^database\s+hdb/)
 				{
 					print $fh $_ . $checkpoint_hdb;
 					next;