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

[matthijs at alioth.debian.org]

tags 226090 pending
thanks

Author: matthijs
Date: 2010-04-22 21:45:27 +0000 (Thu, 22 Apr 2010)
New Revision: 1264

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.scripts-common
   openldap/trunk/debian/slapd.templates
Log:
 * Add critical report when slapcat fails.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-04-19 14:27:17 UTC (rev 1263)
+++ openldap/trunk/debian/changelog	2010-04-22 21:45:27 UTC (rev 1264)
@@ -25,8 +25,9 @@
   * Add autogroup slapd module, used patch from Mathieu Parent (Closes: #575900)
   * Add lsb logging, used patch from David Härdeman (Closes: #385898)
   * Use dh_lintian to install the lintian-overrides
+  * Added critical error report when slapcat fails (Closes: #226090)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Mon, 19 Apr 2010 10:23:36 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Thu, 22 Apr 2010 23:40:30 +0200
 
 openldap (2.4.17-2.1) unstable; urgency=high
 

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2010-04-19 14:27:17 UTC (rev 1263)
+++ openldap/trunk/debian/slapd.scripts-common	2010-04-22 21:45:27 UTC (rev 1264)
@@ -144,6 +144,9 @@
 		if [ "$failed" ]; then
 			rm -f "$file"
 			echo failed. >&2
+			db_subst slapd/upgrade_slapcat_failure location "$dir"
+			db_input critical slapd/upgrade_slapcat_failure || true
+			db_go || true
 			exit 1
 		fi
 		echo "done." >&2

Modified: openldap/trunk/debian/slapd.templates
===================================================================
--- openldap/trunk/debian/slapd.templates	2010-04-19 14:27:17 UTC (rev 1263)
+++ openldap/trunk/debian/slapd.templates	2010-04-22 21:45:27 UTC (rev 1264)
@@ -120,7 +120,7 @@
 # This paragraph is followed by a (non translatable) paragraph
 # containing a command line
 #flag:comment:6
-# Translators: keep "$location" unchanged. This is a variable that
+# Translators: keep "${location}" unchanged. This is a variable that
 # will be replaced by a directory name at execution
 _Description: slapcat failure during upgrade
  An error occurred while upgrading the LDAP directory.
@@ -134,10 +134,10 @@
  again, you should move the old database files back into place, fix
  whatever caused slapcat to fail, and run:
  .
-  slapcat > $location
+  slapcat > ${location}
  .
  Then move the database files back to a backup area and then try running
- slapadd from $location.
+ slapadd from ${location}.
 
 Template: slapd/backend
 Type: select