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

[Sean Finney]

tags 391160 pending
thanks

Author: seanius
Date: 2006-10-10 09:02:13 +0000 (Tue, 10 Oct 2006)
New Revision: 336

Modified:
   trunk/debian/changelog
   trunk/dpkg/common
Log:
multidbtype fix

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-10-07 12:38:12 UTC (rev 335)
+++ trunk/debian/changelog	2006-10-10 09:02:13 UTC (rev 336)
@@ -1,3 +1,12 @@
+dbconfig-common (1.8.25) UNRELEASED; urgency=high
+
+  * fixed bugs found by Finn Smith:
+    - multidbtype packages would fail to install if the user declined 
+      our help (closes: #391160).
+  * 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
+
 dbconfig-common (1.8.24) unstable; urgency=high
 
   * updated spanish debconf translations from Javier Fernández-Sanguino Peña 

Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2006-10-07 12:38:12 UTC (rev 335)
+++ trunk/dpkg/common	2006-10-10 09:02:13 UTC (rev 336)
@@ -287,14 +287,17 @@
 	# dbconfig needs to be reloaded at this point for multi-dbtype apps
 	dbc_set_dbtype_defaults $dbc_dbtype
 
-	# 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"
 
+	# if they don't want help, then we're done and return early
+	if [ "$dbc_install" != "true" ]; then return 0; fi
+	
+	# otherwise, just to make sure dbtype is set...
+	_dbc_sanity_check dbtype || dbc_install_error
+
 	if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
 		# get app user
 		db_get $dbc_package/db/app-user && dbc_dbuser="$RET"