[Dbconfig-common-changes] [dbconfig-common] r440 - in trunk: . debian internal

[Sean Finney]

tags 435143 pending
tags 473013 pending
thanks

Author: seanius
Date: 2008-04-10 16:29:15 +0000 (Thu, 10 Apr 2008)
New Revision: 440

Modified:
   trunk/dbconfig-generate-include
   trunk/debian/changelog
   trunk/debian/control
   trunk/internal/pgsql
Log:
two fixes from niko

Modified: trunk/dbconfig-generate-include
===================================================================
--- trunk/dbconfig-generate-include	2008-04-10 16:12:06 UTC (rev 439)
+++ trunk/dbconfig-generate-include	2008-04-10 16:29:15 UTC (rev 440)
@@ -405,7 +405,7 @@
 
 if [ "$outputfile" ]; then
 	if [ "$do_ucf" ]; then
-		ucf "$tmpout" "$outputfile"
+		ucf --debconf-ok "$tmpout" "$outputfile" >&2
 		rm -f "$tmpout"
 	else
 		mv "$tmpout" "$outputfile"

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-10 16:12:06 UTC (rev 439)
+++ trunk/debian/changelog	2008-04-10 16:29:15 UTC (rev 440)
@@ -4,6 +4,8 @@
   * 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).
+    - fix for empty dumps from postgres upgrades (closes: #473013).
+    - fix for ucf/debconf/stdout redirection problems (closes: #435143).
   * 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/debian/control
===================================================================
--- trunk/debian/control	2008-04-10 16:12:06 UTC (rev 439)
+++ trunk/debian/control	2008-04-10 16:29:15 UTC (rev 440)
@@ -7,7 +7,7 @@
 
 Package: dbconfig-common
 Architecture: all
-Depends: ucf, ${misc:Depends}
+Depends: ucf (>= 0.28), ${misc:Depends}
 Suggests: virtual-mysql-client | mysql-client | postgresql-client
 Description: common framework for packaging database applications
  dbconfig-common presents a policy and implementation for

Modified: trunk/internal/pgsql
===================================================================
--- trunk/internal/pgsql	2008-04-10 16:12:06 UTC (rev 439)
+++ trunk/internal/pgsql	2008-04-10 16:29:15 UTC (rev 440)
@@ -170,7 +170,6 @@
 _dbc_pg_dump(){
 	local extra retval PGSSLMODE localuser _dbc_asuser dumpfile
 	dumpfile=$1
-	extra="-f $dumpfile"
 	localuser=`_dbc_psql_local_username`
 	touch $dumpfile
 	chown $localuser $dumpfile
@@ -179,6 +178,7 @@
 	_dbc_psql_cmd_setup
 	if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
 	extra=`_dbc_psql_cmd_args`
+	extra="-f \"$dumpfile\" $extra"
 	_dbc_debug "su -s /bin/sh $localuser -c \"env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' pg_dump $extra $dbc_dbname\" 2>&1"
 	dbc_error=`su -s /bin/sh $localuser -c "env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' pg_dump $extra $dbc_dbname" 2>&1` || retval=$?
 	_dbc_psql_cmd_cleanup