[Dbconfig-common-changes] [dbconfig-common] r348 - in trunk: debian dpkg

[Sean Finney]

tags 393124 pending
thanks

Author: seanius
Date: 2006-10-15 16:42:47 +0000 (Sun, 15 Oct 2006)
New Revision: 348

Modified:
   trunk/debian/changelog
   trunk/dpkg/common
Log:
sigh, another fix for a fix for a fix

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-10-13 08:52:58 UTC (rev 347)
+++ trunk/debian/changelog	2006-10-15 16:42:47 UTC (rev 348)
@@ -1,3 +1,12 @@
+dbconfig-common (1.8.27) unstable; urgency=high
+
+  * the "patch to fix the patch to fix the patch to fix the bug" release
+  * unregistered pgsql questions were being asked even in mysql packages,
+    causing confusion, breakage, chaos, riots, etc.  fixed.
+    closes: #393124.
+
+ -- sean finney <seanius at debian.org>  Sun, 15 Oct 2006 18:42:24 +0200
+
 dbconfig-common (1.8.26) unstable; urgency=high
 
   * the previous upload included a changelog entry that closed the

Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2006-10-13 08:52:58 UTC (rev 347)
+++ trunk/dpkg/common	2006-10-15 16:42:47 UTC (rev 348)
@@ -231,14 +231,6 @@
 	# 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 which shouldn't be set unless we know the dbtype
 	if [ ! "$dbc_dbtype" ]; then return 0 ; fi
 
@@ -269,6 +261,10 @@
 
 	case $dbc_dbtype in
 	"pgsql")
+		# 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"
+
 		# ident based auth doesn't need a password
 		if [ "$dbc_authmethod_admin" != "ident" ]; then
 			# set the database administrator pass