[Dbconfig-common-devel] dbconfig-common/dpkg common,1.18,1.19

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

Modified Files:
	common 
Log Message:
more suggestions from tobias

Index: common
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/common,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19

--- common	26 Apr 2005 04:30:54 -0000	1.18
+++ common	27 Apr 2005 02:03:22 -0000	1.19
@@ -436,16 +436,17 @@
 
 		# get the appistrative password
 		db_input high $dbc_package/$dbc_dbtype/app-pass || true
-
-		# get the password again
-		db_input high $dbc_package/app-password-confirm || true
-
-		# get the info
 		db_go || true
 		db_get $dbc_package/$dbc_dbtype/app-pass
 		pass1="$RET"
-		db_get $dbc_package/app-password-confirm
-		pass2="$RET"
+
+		# get the password again, if it is not empty
+		if [ "$pass1" ]; then
+			db_input high $dbc_package/app-password-confirm || true
+			db_go || true
+			db_get $dbc_package/app-password-confirm
+			pass2="$RET"
+		fi
 
 		# test to see if the passwords match
 		if [ "$pass1" = "$pass2" ]; then



