confsubst.in: Allow empty right-hand side in substitutions.

They do occur naturally, and then you're stuffed.  This is release
1.3.10.1.

diff --git a/confsubst.in b/confsubst.in
index 86c8bb0..285e031 100755 (executable)
--- a/confsubst.in
+++ b/confsubst.in
@@ -75,7 +75,7 @@ file=$1; shift
 subst=""
 for fixup; do
   case "$fixup" in
 subst=""
 for fixup; do
   case "$fixup" in

-    *?=*?) ;;
+    *?=*) ;;

     *) echo >&2 "$0: bad substitution: $fixup"; exit 1 ;;
   esac
   tag=$(echo "$fixup" | sed 's/=.*$//') && \
     *) echo >&2 "$0: bad substitution: $fixup"; exit 1 ;;
   esac
   tag=$(echo "$fixup" | sed 's/=.*$//') && \

diff --git a/debian/changelog b/debian/changelog
index 66f3042..9874897 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cfd (1.3.10.1) experimental; urgency=low
+
+  * confsubst: Allow empty right-hand-side.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Wed, 19 Jun 2013 09:45:13 +0100
+

 cfd (1.3.10) experimental; urgency=low
 
   * Overhaul of Python support.  In particular, handling of generated
 cfd (1.3.10) experimental; urgency=low
 
   * Overhaul of Python support.  In particular, handling of generated