[Pkg-openldap-devel] [openldap] 05/08: r1814 at pulsar: torsten | 2005-04-21 01:59:48 +0200 * debian/slapd.scripts-common: Remove the alert_user function which was there to output an error message in case debconf is not available.

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to annotated tag 2.2.23-4
in repository openldap.

commit 1cc43e39eb677fb5bba6f7ad0599c5d93b0bd744
Author: Torsten Landschoff <torsten at debian.org>
Date:   Wed Apr 20 23:53:36 2005 +0000

     r1814 at pulsar:  torsten | 2005-04-21 01:59:48 +0200
      * debian/slapd.scripts-common: Remove the alert_user function which
        was there to output an error message in case debconf is not available.
---
 debian/changelog            |    2 ++
 debian/slapd.scripts-common |   46 -------------------------------------------
 2 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a7317d..ce98ee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ openldap2.2 (2.2.23-4) unstable; urgency=low
   * debian/control: Make the requirement for debconf a pre-dependency as
     we are using it from the maintainer scripts.
   * debian/slapd.preinst: Always use debconf (don't check for availability).
+  * debian/slapd.scripts-common: Remove the alert_user function which 
+    was there to output an error message in case debconf is not available.
 
  --
 
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index ff4b1bf..7e9435c 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -645,52 +645,6 @@ extend_existing_allow_directive() {					# {{{
 	perl -e "$script" || return 1
 }
 # }}}
-alert_user() {								# {{{
-# Tell the user that something went miserably wrong.
-# Usage: alert_user <key>
-# Currently key can be upgrade_slapcat_failure
-
-	local dc_failed key
-	key="$1"
-	dc_failed=
-
-	# Make sure the template is actually displayed
-	db_fset slapd/$key seen false || dc_failed=1
-	db_input high slapd/$key || dc_failed=1
-	db_go || dc_failed=1
-
-	if [ "$dc_failed" -a "$key" = "upgrade_slapcat_failure"  ]; then
-		cat <<EOF
-When attempting to upgrade your LDAP directory there was an error.
-This error occured when performing the 'slapcat' which attempts to
-extract your LDAP directory.  This failure could be because of an
-incorrect config file.  For example, if the appropriate moduleload
-lines for your backend database type are missing.  This failure
-will cause 'slapadd' later to fail too.  The old database files are
-about to be moved to /var/backups.  If you want to try this upgrade
-again then move the old database files back into place, fix whatever
-caused slapcat to fail, and run:
-slapcat | /usr/share/slapd/fix_ldif -w -o "$organization" > $location
-Move the database files back to a backup area and then try and
-slapadd from $location.
-EOF
-	elif [ "$dc_failed" -a "$key" = "upgrade_slapadd_failure"  ]; then
-		cat <<EOF
- When attempting to upgrade your LDAP directory there was an error.
- This error occured when performing the 'slapadd' which attempts to
- populate an empty new LDAP directory using the information from your
- original LDAP directory.  Your original LDAP directory files have
- been saved in /var/backups.  The results of the attempted upgrade
- is the ldif file in /var/backups.  slapadd may have failed due to
- a configuration problem (in which case slapcat would have failed
- too) or due to a problem in the ldif.  If the problem was with the
- ldif then you may be able to fix it and attempt the slapadd again.
-EOF
-	fi
-
-	exit 1
-} 
-# }}}
 fix_ldif() {								# {{{
 # Fix the directory when upgrading from before 2.1 and the root
 # dn has no structural objectclass

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git