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

[Sean Finney]

tags 473028 pending
thanks

Author: seanius
Date: 2008-07-04 23:07:33 +0000 (Fri, 04 Jul 2008)
New Revision: 457

Modified:
   trunk/debian/changelog
   trunk/dpkg/common
   trunk/dpkg/postinst
Log:
#473028

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-04 22:55:00 UTC (rev 456)
+++ trunk/debian/changelog	2008-07-04 23:07:33 UTC (rev 457)
@@ -4,8 +4,10 @@
   * fix for package failing to purge, thanks to Michael Tautschnig for
     reporting this (closes: #476949).
   * rc bugfix, high urgency upload.
+  * fix for empty debconf substitution in the upgrade-error template, thanks
+    to Niko Tyni for the report (closes: #473028).
 
- -- sean finney <seanius at debian.org>  Fri, 11 Apr 2008 20:17:41 +0200
+ -- Sean Finney <seanius at debian.org>  Sat, 05 Jul 2008 01:07:31 +0200
 
 dbconfig-common (1.8.38) unstable; urgency=low
 

Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2008-07-04 22:55:00 UTC (rev 456)
+++ trunk/dpkg/common	2008-07-04 23:07:33 UTC (rev 457)
@@ -647,7 +647,7 @@
 	echo $dbc_error >&2
 	db_fset $dbc_package/upgrade-error seen false
 	db_subst $dbc_package/upgrade-error error $dbc_error
-	db_subst $dbc_package/upgrade-error dbfile $dbc_dbfile
+	db_subst $dbc_package/upgrade-error dbfile $dbc_dumpfile
 	db_input critical $dbc_package/upgrade-error || true
 	db_go || true
         db_get $dbc_package/upgrade-error

Modified: trunk/dpkg/postinst
===================================================================
--- trunk/dpkg/postinst	2008-07-04 22:55:00 UTC (rev 456)
+++ trunk/dpkg/postinst	2008-07-04 23:07:33 UTC (rev 457)
@@ -2,7 +2,7 @@
 ### load up common variables and functions
 ###
 dbc_go(){
-	local importing_from_non_dbc upgrading reconfiguring f tsubstfile upgrades_pending dumpfile _dbc_asuser reinstall
+	local importing_from_non_dbc upgrading reconfiguring f tsubstfile upgrades_pending dbc_dumpfile _dbc_asuser reinstall
 
 	. /usr/share/dbconfig-common/dpkg/common
 	_dbc_debug "(postinst) dbc_go() $@"
@@ -175,11 +175,11 @@
 				fi
 
 				# this is the file into which upgrade backups go
-				dumpfile=/var/cache/dbconfig-common/backups/${dbc_package}_${dbc_oldversion}.$dbc_dbtype	
-				dbc_logline "creating database backup in $dumpfile"
+				dbc_dumpfile=/var/cache/dbconfig-common/backups/${dbc_package}_${dbc_oldversion}.$dbc_dbtype	
+				dbc_logline "creating database backup in $dbc_dumpfile"
 				# backup before we upgrade
 				_dbc_asuser=""
-				$dbc_dump_cmd $dumpfile || dbc_upgrade_error "backing up the old database"
+				$dbc_dump_cmd $dbc_dumpfile || dbc_upgrade_error "backing up the old database"
 			fi
 
 			# now perform the updates