[Dbconfig-common-changes] [dbconfig-common] r337 - in trunk: debian dpkg examples/db-test-multidbtype-2.0/debian

[Sean Finney]

tags 391997 pending
thanks

Author: seanius
Date: 2006-10-10 09:31:03 +0000 (Tue, 10 Oct 2006)
New Revision: 337

Modified:
   trunk/debian/changelog
   trunk/dpkg/common
   trunk/examples/db-test-multidbtype-2.0/debian/config
Log:
preseed bug for multidbtype

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-10-10 09:02:13 UTC (rev 336)
+++ trunk/debian/changelog	2006-10-10 09:31:03 UTC (rev 337)
@@ -3,9 +3,11 @@
   * fixed bugs found by Finn Smith:
     - multidbtype packages would fail to install if the user declined 
       our help (closes: #391160).
+    - preseed values for dbc_authmethod_foo were being ignored for
+      multidbtype packages (closes: #391997).
   * previous version hasn't made it to testing, <=> urgency stays high.
 
- -- sean finney <seanius at debian.org>  Tue, 10 Oct 2006 10:59:08 +0200
+ -- sean finney <seanius at debian.org>  Tue, 10 Oct 2006 11:30:34 +0200
 
 dbconfig-common (1.8.24) unstable; urgency=high
 

Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2006-10-10 09:02:13 UTC (rev 336)
+++ trunk/dpkg/common	2006-10-10 09:31:03 UTC (rev 337)
@@ -218,8 +218,16 @@
 
 	# set the dbtype
 	db_set $dbc_package/database-type "$dbc_dbtype"
+	
+	# the following db-specific settings always need to be preseeded, even
+	# if we don't know that we're configuring for the given database type
+	#
+	# set the psql authentication method
+	db_set $dbc_package/pgsql/authmethod-admin "$dbc_authmethod_admin"
+	db_set $dbc_package/pgsql/authmethod-user "$dbc_authmethod_user"
 
-	# a few db-specific things, don't preseed them if we don't know the dbtype yet
+
+	# a few db-specific things which shouldn't be set unless we know the dbtype
 	if [ ! "$dbc_dbtype" ]; then return 0 ; fi
 
 	if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
@@ -249,10 +257,6 @@
 
 	case $dbc_dbtype in
 	"pgsql")
-		# get the psql authentication method
-		db_set $dbc_package/pgsql/authmethod-admin "$dbc_authmethod_admin"
-		db_set $dbc_package/pgsql/authmethod-user "$dbc_authmethod_user"
-
 		# ident based auth doesn't need a password
 		if [ "$dbc_authmethod_admin" != "ident" ]; then
 			# set the database administrator pass

Modified: trunk/examples/db-test-multidbtype-2.0/debian/config
===================================================================
--- trunk/examples/db-test-multidbtype-2.0/debian/config	2006-10-10 09:02:13 UTC (rev 336)
+++ trunk/examples/db-test-multidbtype-2.0/debian/config	2006-10-10 09:31:03 UTC (rev 337)
@@ -7,6 +7,7 @@
 
 if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
 	dbc_dbtypes="mysql, pgsql"
+	dbc_authmethod_user="password"
 	. /usr/share/dbconfig-common/dpkg/config 
 	dbc_go db-test-multidbtype $@
 fi