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

[Sean Finney]

tags 469832 pending
thanks

Author: seanius
Date: 2008-04-10 17:03:41 +0000 (Thu, 10 Apr 2008)
New Revision: 442

Modified:
   trunk/debian/changelog
   trunk/dpkg/config
Log:
dbtype order

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-10 17:00:23 UTC (rev 441)
+++ trunk/debian/changelog	2008-04-10 17:03:41 UTC (rev 442)
@@ -7,6 +7,7 @@
     - fix for empty dumps from postgres upgrades (closes: #473013).
     - fix for ucf/debconf/stdout redirection problems (closes: #435143).
     - fix for db server/client installed status differences (closes: #448804).
+    - allow specifying preferred order in dbtype selection (closes: #469832).
   * centralize definition of dbc.log location
   * a test suite! now using shunit2 for unit tests, implemented some
     basic tests for logging as a proof-of-concept.

Modified: trunk/dpkg/config
===================================================================
--- trunk/dpkg/config	2008-04-10 17:00:23 UTC (rev 441)
+++ trunk/dpkg/config	2008-04-10 17:03:41 UTC (rev 442)
@@ -3,7 +3,7 @@
 ###
 
 dbc_go(){
-	local f db happy default_dbtype host newhost port oldhosts authmethod_admin do_config _preconf_list _s _t STATE iformat ifile install_question migrating userdb_prio
+	local f db happy default_dbtype host newhost port oldhosts authmethod_admin do_config _preconf_list _s _t STATE iformat ifile install_question migrating userdb_prio supported_dbtypes
 	. /usr/share/dbconfig-common/dpkg/common
 	_dbc_debug "(config) dbc_go() $@"
 
@@ -116,8 +116,9 @@
 			dbc_dbtype=$dbc_hardcoded_dbtype
 		# else if the package supports multiple dbtypes, help them pick one
 		elif [ "$dbc_dbtypes" ]; then
-		# loop through all available dbtypes
-			for db in $dbc_all_supported_dbtypes; do
+		# loop through the listed dbtypes, fall back to all those available
+			supported_dbtypes=$(echo $dbc_dbtypes | sed 's/,/ /g')
+			for db in $supported_dbtypes $dbc_all_supported_dbtypes; do
 				# if we're already happy, we're already done
 				if [ "$happy" ]; then
 					true