[Pkg-openldap-devel] [openldap] 31/39: r1729 at pulsar: torsten | 2005-04-14 12:39:42 +0200 Fix typos and a logic error in database_dumping_destdir

[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 9d7cab6bdfbbe855342d78effbbb7b4ae62b2f49
Author: Torsten Landschoff <torsten at debian.org>
Date:   Thu Apr 14 10:40:15 2005 +0000

     r1729 at pulsar:  torsten | 2005-04-14 12:39:42 +0200
     Fix typos and a logic error in database_dumping_destdir
---
 debian/slapd.scripts-common |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index 2df3d4a..dd6a9f3 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -81,12 +81,13 @@ database_dumping_destdir() {						# {{{
 # if it does not exist.
 # Usage: destdir=`database_dumping_destdir`
 
+	local dir
 	db_get slapd/dump_database_destdir
-	mkdir -p -m 700 "$RET"
-	echo "$RET"|sed -e "s/VERSION/$OLD_VERSION/"
+	dir=`echo "$RET"|sed -e "s/VERSION/$OLD_VERSION/"`
+	mkdir -p -m 700 "$dir"
+	echo $dir
 }
 
-
 # }}}
 
 # }}}
@@ -781,7 +782,7 @@ install_new_slapd_conf() {						# {{{
 	local conf_new
 	conf_new="$1"
 
-	backup_configuration_once
+	backup_config_once
 
 	# Make sure we keep the permissions of an old slapd.conf
 	if [ -e "$SLAPD_CONF" ]; then
@@ -790,14 +791,14 @@ install_new_slapd_conf() {						# {{{
 	mv "$conf_new" "$SLAPD_CONF"
 }
 # }}}
-backup_configuration_once() {						# {{{
+backup_config_once() {							# {{{
 # Create a backup of the current configuration files. 
-# Usage: backup_configuration_once
+# Usage: backup_config_once
 
 	local backupdir
 
 	if [ -z "$FLAG_CONFIG_BACKED_UP" ]; then
-		backupdir=`database_dump_destdir`
+		backupdir=`database_dumping_destdir`
 		if [ -e "$SLAPD_CONF" ]; then
 			cp -a "$SLAPD_CONF" "$backupdir"
 		fi

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