[Dbconfig-common-devel] dbconfig-common/dpkg common, 1.32, 1.33 config, 1.22, 1.23

[seanius at haydn.debian.org]

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

Modified Files:
	common config 
Log Message:
updated debconf po file, and some bug fixes on last night's commit.

this one's off to unstable!

	sean



Index: common
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/common,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- common	24 Aug 2005 23:37:12 -0000	1.32
+++ common	25 Aug 2005 13:43:03 -0000	1.33
@@ -208,11 +208,20 @@
 	# just to make sure...
 	_dbc_sanity_check dbtype || dbc_install_error
 
+	# get whether they want our help with various stuff
+	db_get $dbc_package/dbconfig-install && dbc_install="$RET"
+	db_get $dbc_package/dbconfig-upgrade && dbc_upgrade="$RET"
+	db_get $dbc_package/dbconfig-remove && dbc_remove="$RET"
+
 	# get app user
 	db_get $dbc_package/db/app-user && dbc_dbuser="$RET"
 
-	# get the db server
+	# get the app user password
+	db_get $dbc_package/$dbc_dbtype/app-pass && dbc_dbpass="$RET"
+
+	# get the db server/port
 	db_get $dbc_package/remote/host && dbc_dbserver="$RET"
+	db_get $dbc_package/remote/port && dbc_dbport="$RET"
 
 	# get the name of the database to be created
 	db_get $dbc_package/db/dbname && dbc_dbname="$RET"
@@ -220,29 +229,16 @@
 	# get the database administrator name
 	db_get $dbc_package/$dbc_dbtype/admin-user && dbc_dbadmin="$RET"
 
+	# get the database administrator pass
+	db_get $dbc_package/$dbc_dbtype/admin-pass && dbc_dbadmpass="$RET"
+
 	# a few db-specific things
 	case $dbc_dbtype in
-	"mysql")
-		# get the database administrator pass
-		db_get $dbc_package/$dbc_dbtype/admin-pass && dbc_dbadmpass="$RET"
-		# get the app user password
-		db_get $dbc_package/$dbc_dbtype/app-pass && dbc_dbpass="$RET"
-	;;
 	"pgsql")
 		# get the psql authentication method
 		db_get $dbc_package/pgsql/authmethod-admin && dbc_authmethod_admin="$RET"
 		db_get $dbc_package/pgsql/authmethod-user && dbc_authmethod_user="$RET"
 
-		# ident based auth doesn't need a password
-		if [ "$dbc_authmethod_admin" != "ident" ]; then
-			# get the database administrator pass
-			db_get $dbc_package/pgsql/admin-pass && dbc_dbadmpass="$RET"
-		fi
-		if [ "$dbc_authmethod_user" != "ident" ]; then
-			# get the database user pass
-			db_get $dbc_package/pgsql/app-pass && dbc_dbpass="$RET"
-		fi
-
 		# get whether or not they want to force SSL
 		db_get $dbc_package/pgsql/method && dbc_method="$RET"
 		if [ "$dbc_method" = "tcp/ip + ssl" ]; then

Index: config
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/config,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- config	24 Aug 2005 23:37:12 -0000	1.22
+++ config	25 Aug 2005 13:43:03 -0000	1.23
@@ -29,9 +29,6 @@
 	case "$STATE" in
 	# state 1 - ask if they want our help at all
 	1)
-		if [ "$dbc_install" ]; then 
-			db_set $dbc_package/dbconfig-install "$dbc_install" 
-		fi
 		db_input medium $dbc_package/dbconfig-install || true
 	;;
 	# state 2 - check to see if they do.