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

[Sean Finney]

Author: seanius
Date: 2007-06-22 13:19:49 +0000 (Fri, 22 Jun 2007)
New Revision: 407

Modified:
   trunk/debian/changelog
   trunk/dpkg/common
   trunk/dpkg/postinst
Log:
under-the-hood basepackage stuff

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-06-18 20:22:34 UTC (rev 406)
+++ trunk/debian/changelog	2007-06-22 13:19:49 UTC (rev 407)
@@ -4,7 +4,10 @@
   * Updated Vietnamese debconf translations from Clytie Siddall 
     (closes: #426841).
   * initial attempt at handling more gracefully situations where a
-    database was not installed before the package was installed
+    database was not installed before the package was installed.  The
+    text is not yet marked translatable since i don't think it's final yet.
+  * do some more under-the-hood stuff for multi-instance support in the up
+    and coming webapps-common package.
 
  -- sean finney <seanius at debian.org>  Mon, 18 Jun 2007 18:15:29 +0100
 

Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2007-06-18 20:22:34 UTC (rev 406)
+++ trunk/dpkg/common	2007-06-22 13:19:49 UTC (rev 407)
@@ -16,6 +16,7 @@
 	###
 	dbc_share="/usr/share/dbconfig-common"
 	dbc_package="$1"
+	dbc_basepackage=`echo $dbc_package | cut -d_ -f1`
 	dbc_command="$2"
 	dbc_oldversion="$3"
 

Modified: trunk/dpkg/postinst
===================================================================
--- trunk/dpkg/postinst	2007-06-18 20:22:34 UTC (rev 406)
+++ trunk/dpkg/postinst	2007-06-22 13:19:49 UTC (rev 407)
@@ -84,9 +84,9 @@
 			### populate the database
 			###
 			# sqlfile is the file to use for installing the database
-			dbc_sqlfile=$dbc_share/data/$dbc_package/install/$dbc_dbtype
-			dbc_sqlfile_adm=$dbc_share/data/$dbc_package/install-dbadmin/$dbc_dbtype
-			dbc_scriptfile=$dbc_share/scripts/$dbc_package/install/$dbc_dbtype
+			dbc_sqlfile=$dbc_share/data/$dbc_basepackage/install/$dbc_dbtype
+			dbc_sqlfile_adm=$dbc_share/data/$dbc_basepackage/install-dbadmin/$dbc_dbtype
+			dbc_scriptfile=$dbc_share/scripts/$dbc_basepackage/install/$dbc_dbtype
 			if [ -f "$dbc_scriptfile" ]; then
 				dbc_logpart "populating database via scriptfile... "
 				if ! sh -c "$dbc_scriptfile $*"; then
@@ -197,9 +197,9 @@
 _dbc_find_upgrades(){
 	local f s sqldir admsqldir scriptdir upgradedirs pending sorted placed tlist
 	# check for new upgrades in these three locations
-	sqldir=$dbc_share/data/$dbc_package/upgrade/$dbc_dbtype
-	admsqldir=$dbc_share/data/$dbc_package/upgrade-dbadmin/$dbc_dbtype
-	scriptdir=$dbc_share/scripts/$dbc_package/upgrade/$dbc_dbtype
+	sqldir=$dbc_share/data/$dbc_basepackage/upgrade/$dbc_dbtype
+	admsqldir=$dbc_share/data/$dbc_basepackage/upgrade-dbadmin/$dbc_dbtype
+	scriptdir=$dbc_share/scripts/$dbc_basepackage/upgrade/$dbc_dbtype
 
 	for f in $sqldir $admsqldir $scriptdir; do
 		if [ -d "$f" ]; then
@@ -262,9 +262,9 @@
 	_dbc_debug "_dbc_apply_upgrades() $@"
 	# check for new upgrades in these three locations
 	vers="$1"
-	sqlfile="$dbc_share/data/$dbc_package/upgrade/$dbc_dbtype/$vers"
-	admsqlfile="$dbc_share/data/$dbc_package/upgrade-dbadmin/$dbc_dbtype/$vers"
-	scriptfile="$dbc_share/scripts/$dbc_package/upgrade/$dbc_dbtype/$vers"
+	sqlfile="$dbc_share/data/$dbc_basepackage/upgrade/$dbc_dbtype/$vers"
+	admsqlfile="$dbc_share/data/$dbc_basepackage/upgrade-dbadmin/$dbc_dbtype/$vers"
+	scriptfile="$dbc_share/scripts/$dbc_basepackage/upgrade/$dbc_dbtype/$vers"
 
 
 	# now go through script updates