[Pkg-openldap-devel] [openldap] 34/39: r1740 at pulsar: torsten | 2005-04-14 16:01:48 +0200 * Trivial improvements: + Don't ask to move contents of /var/lib/ldap if it does not even exist (but also is not an empty directory...) in initial config. + Move check for current installation status out of configure_dumping. --

[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-2
in repository openldap.

commit bedf25b3b4af498b9891dc428f74e837ed5e194a
Author: Torsten Landschoff <torsten at debian.org>
Date:   Thu Apr 14 14:00:46 2005 +0000

     r1740 at pulsar:  torsten | 2005-04-14 16:01:48 +0200
      * Trivial improvements:
        + Don't ask to move contents of /var/lib/ldap if it does not even
          exist (but also is not an empty directory...) in initial config.
        + Move check for current installation status out of configure_dumping.
     --
---
 debian/changelog            |    6 +++++-
 debian/slapd.config         |    5 ++++-
 debian/slapd.scripts-common |   18 +++---------------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d152f5..8136677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,12 @@ openldap2.2 (2.2.23-2) unstable; urgency=low
     + Run debconf-updatepo and send new fr.po to Christian Perrier.
   * debian/slapd.postinst: Make a backup copy of slapd.conf before changing
     anything (closes: #304485).
+  * Trivial improvements: 
+    + Don't ask to move contents of /var/lib/ldap if it does not even
+      exist (but also is not an empty directory...) in initial config.
+    + Move check for current installation status out of configure_dumping.
 
- -- Torsten Landschoff <torsten at debian.org>  Thu, 14 Apr 2005 11:46:50 +0200
+ -- 
 
 openldap2.2 (2.2.23-1) unstable; urgency=low
 
diff --git a/debian/slapd.config b/debian/slapd.config
index 3995f92..e17cf75 100644
--- a/debian/slapd.config
+++ b/debian/slapd.config
@@ -18,7 +18,10 @@ if is_initial_configuration "$@"; then
   fi
 fi
 
-configure_dumping
+# Configure the dumping component if we are upgrading some older version
+if [ "$1" == configure ] && [ -n "$2" ]; then
+	configure_dumping
+fi
    
 # On upgrade from pre-2.1 we have to ask if we shall fix the config file (if
 # it exists anyway).
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index dd6a9f3..73fe8c8 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -17,20 +17,8 @@
 # are doing.
 
 configure_dumping() {							# {{{
-# In case we are upgrading from an older version we ask the user for the
-# configuration of the dumping component.
-# XXX: Rethink this checks...  -- Torsten
-# Usage: configure_dumping (from .config script)
-
-	# Make sure we are either upgrading the package or reconfiguring
-	# an installed version.
-	if [ "$MODE" = configure ] && [ "$OLD_VERSION" ]; then
-		true
-	elif [ "$MODE" = reconfigure ]; then
-		true
-	else
-		return 0
-	fi
+# Ask the user for the configuration of the dumping component
+# Usage: configure_dumping
 
 	# Configure if and where to dump the LDAP databases
 	db_input medium slapd/dump_database || true
@@ -849,7 +837,7 @@ query_initial_config() {
     db_input low slapd/purge_database || true
     # XXX - should be done more general, but for now this should do
     # the trick
-    if ! is_empty_dir /var/lib/ldap; then
+    if [-e "/var/lib/ldap" ] && ! is_empty_dir /var/lib/ldap; then
       db_input low slapd/move_old_database || true
     fi
     db_go || true

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