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

[Sean Finney]

Author: seanius
Date: 2006-05-24 16:21:29 +0000 (Wed, 24 May 2006)
New Revision: 223

Modified:
   trunk/debian/changelog
   trunk/dpkg/config
Log:
Bug#368714: config script fails if no configuration present in /etc/dbconfig-common

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-05-24 15:40:16 UTC (rev 222)
+++ trunk/debian/changelog	2006-05-24 16:21:29 UTC (rev 223)
@@ -1,5 +1,6 @@
 dbconfig-common (1.8.14) UNRELEASED; urgency=low
 
+  [sean finney]
   * provide a new hint option dbc_sql_substitutions, which will pipe
     all provided sql files through the template-based substitution
     filter of dbconfig-generate-include before being processed 
@@ -9,8 +10,10 @@
   * provide a new hint option dbc_default_authmethod_user for the packager
     to provide the "sane default" for how the application's database
     user should authenticate for pgsql applications (closes: #368219).
+  * extra sanity check for a glob that might not expand in some circumstances,
+    from matt brown (closes: #368714).
 
- -- sean finney <seanius at debian.org>  Tue, 23 May 2006 09:06:54 +0200
+ -- sean finney <seanius at debian.org>  Wed, 24 May 2006 18:21:06 +0200
 
 dbconfig-common (1.8.13) unstable; urgency=low
 

Modified: trunk/dpkg/config
===================================================================
--- trunk/dpkg/config	2006-05-24 15:40:16 UTC (rev 222)
+++ trunk/dpkg/config	2006-05-24 16:21:29 UTC (rev 223)
@@ -197,6 +197,7 @@
 			# package, and create a list of hosts.
 			_preconf_list=` (
 			for f in /etc/dbconfig-common/*.conf; do
+				test -f $f || continue
 				eval \`dbconfig-generate-include --dbserver=_s $f | grep -v '^#'\`
 				[ "$_s" ] && echo $_s
 			done