[Dbconfig-common-devel] dbconfig-common/dpkg common,1.26,1.27

[seanius@haydn.debian.org]

Update of /cvsroot/dbconfig-common/dbconfig-common/dpkg
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv26580/dpkg

Modified Files:
	common 
Log Message:
- some template wording changes for the install/upgrade/remove error messages
- install/remove/error functions return instead of exit
- cosmetic (indentation) stuff


Index: common
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/common,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- common	13 May 2005 16:04:33 -0000	1.26
+++ common	14 May 2005 17:50:48 -0000	1.27
@@ -323,19 +323,16 @@
 	for f in $dbc_register_templates; do
 		db_fset $dbc_package/$f seen false
 	done
-	# and blank the password
-	# dbc_forget_dbadmin_password
-	# dbc_forget_app_password
 	
 	if [ "$_dbc_on_error_option" = "abort" ]; then
-	echo "$dbc_package $dbc_command: aborted." >&2
-        dbc_postinst_cleanup
-	exit 1
+		echo "dbconfig-common: $dbc_package $dbc_command: aborted." >&2
+		dbc_postinst_cleanup
+		return 1
 	fi
 	
 	if [ "$_dbc_on_error_option" = "retry" ]; then
-	echo "$dbc_package $dbc_command: retrying." >&2
-	dbc_go $dbc_package $dbc_command $dbc_oldversion 
+		echo "dbconfig-common: $dbc_package $dbc_command: retrying." >&2
+		dbc_go $dbc_package $dbc_command $dbc_oldversion 
 	fi
 }
 
@@ -357,22 +354,17 @@
         for f in $dbc_register_templates; do
                db_fset $dbc_package/$f seen false
         done
-        # and blank the password
-        # dbc_forget_dbadmin_password
-        # dbc_forget_app_password
 	
         if [ "$_dbc_on_error_option" = "abort" ]; then
-        echo "$dbc_package $dbc_command: aborted." >&2
-        dbc_postinst_cleanup
-        exit 1
+		echo "dbconfig-common: $dbc_package $dbc_command: aborted." >&2
+		dbc_postinst_cleanup
+		return 1
         fi
 
         if [ "$_dbc_on_error_option" = "retry" ]; then
-        echo "$dbc_package $dbc_command: retrying." >&2
-        dbc_go $dbc_package $dbc_command $dbc_oldversion
+		echo "dbconfig-common: $dbc_package $dbc_command: retrying." >&2
+		dbc_go $dbc_package $dbc_command $dbc_oldversion
         fi
-
-	exit 1
 }
 
 ##
@@ -395,17 +387,14 @@
         done
         
 	if [ "$_dbc_on_error_option" = "abort" ]; then
-        echo "$dbc_package $dbc_command: aborted." >&2
-        dbc_postinst_cleanup
-        exit 1
+		echo "dbconfig-common: $dbc_package $dbc_command: aborted." >&2
+		dbc_postinst_cleanup
         fi
 
         if [ "$_dbc_on_error_option" = "retry" ]; then
-        echo "$dbc_package $dbc_command: retrying." >&2
-        dbc_go $dbc_package $dbc_command $dbc_oldversion
+		echo "dbconfig-common: $dbc_package $dbc_command: retrying." >&2
+		dbc_go $dbc_package $dbc_command $dbc_oldversion
         fi
-	
-	exit 1
 }
 
 ##