From seanius at alioth.debian.org  Fri Jul  4 22:54:48 2008
From: seanius at alioth.debian.org (Sean Finney)
Date: Fri, 04 Jul 2008 22:54:48 +0000
Subject: [Dbconfig-common-changes] [dbconfig-common] r455 - trunk/internal
Message-ID: <E1KEuAy-0003Hz-5c@alioth.debian.org>

Author: seanius
Date: 2008-07-04 22:54:47 +0000 (Fri, 04 Jul 2008)
New Revision: 455

Modified:
   trunk/internal/common
Log:
another fix found from test cases


Modified: trunk/internal/common
===================================================================
--- trunk/internal/common	2008-04-20 21:46:29 UTC (rev 454)
+++ trunk/internal/common	2008-07-04 22:54:47 UTC (rev 455)
@@ -27,7 +27,7 @@
 ### simple debugging function
 ###
 _dbc_debug(){
-	if [ "$dbc_debug" ]; then
+	if [ "${dbc_debug:-}" ]; then
 		dbc_logline "$@"
 	fi
 }



From seanius at alioth.debian.org  Fri Jul  4 22:55:00 2008
From: seanius at alioth.debian.org (Sean Finney)
Date: Fri, 04 Jul 2008 22:55:00 +0000
Subject: [Dbconfig-common-changes] [dbconfig-common] r456 - trunk/test
Message-ID: <E1KEuBA-0003Re-Me@alioth.debian.org>

Author: seanius
Date: 2008-07-04 22:55:00 +0000 (Fri, 04 Jul 2008)
New Revision: 456

Modified:
   trunk/test/mockdb.sh
Log:
add some more log messages in test cases


Modified: trunk/test/mockdb.sh
===================================================================
--- trunk/test/mockdb.sh	2008-07-04 22:54:47 UTC (rev 455)
+++ trunk/test/mockdb.sh	2008-07-04 22:55:00 UTC (rev 456)
@@ -127,7 +127,7 @@
 
   log_tc "checkconnect fails"
   mockup -r 1 _dbc_mysql_check_connect
-  dbc_mysql_createdb >/dev/null 2>&1
+  dbc_mysql_createdb >/dev/null 
   assertFalse "dbc_mysql_createdb (checkconnect) should have failed" $?
 
   log_tc "database already exists"
@@ -456,12 +456,15 @@
 
   t=`mktemp`
   # normal string
+  log_tc "escaping normal string"
   str=`dbc_mysql_escape_str "this is a normal string"`
   assertTrue "error escaping string" "[ '$str' = 'this is a normal string' ]"
   # string with \
+  log_tc "escaping string w/backslash"
   dbc_mysql_escape_str 'should have 1 backslash (\) but escape to 2' > $t
   assertFilesEqual ./data/mysql_escape_str.backslash.txt "$t"
   # string with '
+  log_tc "escaping string w/single quote"
   dbc_mysql_escape_str "it isn't unusual to find quotes" > "$t"
   assertFilesEqual ./data/mysql_escape_str.quote.txt "$t"
 



From seanius at alioth.debian.org  Fri Jul  4 23:07:33 2008
From: seanius at alioth.debian.org (Sean Finney)
Date: Fri, 04 Jul 2008 23:07:33 +0000
Subject: [Dbconfig-common-changes] [dbconfig-common] r457 - in trunk: debian
	dpkg
Message-ID: <E1KEuNJ-0001I2-Bk@alioth.debian.org>

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



From seanius at alioth.debian.org  Fri Jul  4 23:10:43 2008
From: seanius at alioth.debian.org (Sean Finney)
Date: Fri, 04 Jul 2008 23:10:43 +0000
Subject: [Dbconfig-common-changes] [dbconfig-common] r458 - trunk/debian
Message-ID: <E1KEuQN-0003ud-Ta@alioth.debian.org>

tags 472946 pending
thanks

Author: seanius
Date: 2008-07-04 23:10:43 +0000 (Fri, 04 Jul 2008)
New Revision: 458

Modified:
   trunk/debian/changelog
   trunk/debian/dbconfig-common.docs
Log:
472946

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-04 23:07:33 UTC (rev 457)
+++ trunk/debian/changelog	2008-07-04 23:10:43 UTC (rev 458)
@@ -4,8 +4,9 @@
   * 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).
+  * a few more more bugs/fixes from Niko Tyni:
+    - fix for empty substitution in dbc_upgrade_error (closes: #473028).
+    - ensure TODO gets installed, since the docs reference it (closes: #472946).
 
  -- Sean Finney <seanius at debian.org>  Sat, 05 Jul 2008 01:07:31 +0200
 

Modified: trunk/debian/dbconfig-common.docs
===================================================================
--- trunk/debian/dbconfig-common.docs	2008-07-04 23:07:33 UTC (rev 457)
+++ trunk/debian/dbconfig-common.docs	2008-07-04 23:10:43 UTC (rev 458)
@@ -11,3 +11,4 @@
 doc/dbapp-policy.ps
 doc/dbapp-policy.txt
 examples
+TODO



From seanius at alioth.debian.org  Fri Jul  4 23:18:06 2008
From: seanius at alioth.debian.org (Sean Finney)
Date: Fri, 04 Jul 2008 23:18:06 +0000
Subject: [Dbconfig-common-changes] [dbconfig-common] r459 - trunk/debian
Message-ID: <E1KEuXW-0005Y3-53@alioth.debian.org>

Author: seanius
Date: 2008-07-04 23:18:05 +0000 (Fri, 04 Jul 2008)
New Revision: 459

Modified:
   trunk/debian/changelog
Log:
prep for upload

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-04 23:10:43 UTC (rev 458)
+++ trunk/debian/changelog	2008-07-04 23:18:05 UTC (rev 459)
@@ -1,6 +1,5 @@
-dbconfig-common (1.8.39) UNRELEASED; urgency=high
+dbconfig-common (1.8.39) unstable; urgency=high
 
-  * NOT RELEASED YET
   * fix for package failing to purge, thanks to Michael Tautschnig for
     reporting this (closes: #476949).
   * rc bugfix, high urgency upload.



From seanius at alioth.debian.org  Fri Jul  4 23:20:14 2008
From: seanius at alioth.debian.org (Sean Finney)
Date: Fri, 04 Jul 2008 23:20:14 +0000
Subject: [Dbconfig-common-changes] [dbconfig-common] r460 - tags
Message-ID: <E1KEuZa-0005ny-DR@alioth.debian.org>

Author: seanius
Date: 2008-07-04 23:20:14 +0000 (Fri, 04 Jul 2008)
New Revision: 460

Added:
   tags/1.8.39/
Log:
[svn-buildpackage] Tagging dbconfig-common (1.8.39)

Copied: tags/1.8.39 (from rev 459, trunk)



From seanius at alioth.debian.org  Fri Jul  4 23:22:50 2008
From: seanius at alioth.debian.org (Sean Finney)
Date: Fri, 04 Jul 2008 23:22:50 +0000
Subject: [Dbconfig-common-changes] [dbconfig-common] r461 - trunk/debian
Message-ID: <E1KEuc6-00062H-0B@alioth.debian.org>

Author: seanius
Date: 2008-07-04 23:22:49 +0000 (Fri, 04 Jul 2008)
New Revision: 461

Modified:
   trunk/debian/changelog
Log:
new chglog

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-04 23:20:14 UTC (rev 460)
+++ trunk/debian/changelog	2008-07-04 23:22:49 UTC (rev 461)
@@ -1,3 +1,9 @@
+dbconfig-common (1.8.40) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+ -- Sean Finney <seanius at debian.org>  Sat, 05 Jul 2008 01:20:22 +0200
+
 dbconfig-common (1.8.39) unstable; urgency=high
 
   * fix for package failing to purge, thanks to Michael Tautschnig for