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

[Sean Finney]

tags 473026 pending
thanks

Author: seanius
Date: 2008-03-27 23:10:05 +0000 (Thu, 27 Mar 2008)
New Revision: 430

Modified:
   trunk/debian/changelog
   trunk/dpkg/postinst
Log:
#473026

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-27 23:05:45 UTC (rev 429)
+++ trunk/debian/changelog	2008-03-27 23:10:05 UTC (rev 430)
@@ -3,6 +3,7 @@
   * NOT RELEASED YET
   * more bugs/fixes from Niko Tyni (thanks!)
     - fix for malformed log messages (closes: #472993).
+    - fix for catching upgrade errors when calling dbc_dump (closes: #473026).
   * 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/postinst
===================================================================
--- trunk/dpkg/postinst	2008-03-27 23:05:45 UTC (rev 429)
+++ trunk/dpkg/postinst	2008-03-27 23:10:05 UTC (rev 430)
@@ -169,7 +169,7 @@
 				dbc_logline "creating database backup in $dumpfile"
 				# backup before we upgrade
 				_dbc_asuser=""
-				$dbc_dump_cmd $dumpfile
+				$dbc_dump_cmd $dumpfile || dbc_upgrade_error "backing up the old database"
 			fi
 
 			# now perform the updates