From: ianmdlvl <ianmdlvl>
Date: Sun, 13 Aug 2006 23:43:10 +0000 (+0000)
Subject: @@ -1,3 +1,9 @@
X-Git-Tag: debian_version_4_1_6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=1cf20fa8d9c66e15ac58db3c8808acc51b3fa459

@@ -1,3 +1,9 @@
+chiark-utils (4.1.6) unstable; urgency=low
+
+  * backup/snaprsync: work around bug in bash (Debian #382798).
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon, 14 Aug 2006 00:43:00 +0100
+
 chiark-utils (4.1.5) unstable; urgency=low

   * expire-iso8601 - new script.
---

diff --git a/backup/snaprsync b/backup/snaprsync
index 4d2f3ec..e31c27b 100755
--- a/backup/snaprsync
+++ b/backup/snaprsync
@@ -19,9 +19,10 @@
 set -e
 
 badusage () { echo >&2 "snaprsync: bad usage: $1"; exit 12; }
-x () { echo "+ $@"; "$@"; }
-xspawned () { eval "${1}pid=$!; echo \"+[$!] ($1) &\";"; }
-xwait () { eval "echo \"+[\$${1}pid] ($1)...\"; wait \$${1}pid;"; }
+nb_echo () { (echo "$@"); } # See Debian #382798
+x () { nb_echo "+ $@"; "$@"; }
+xspawned () { eval "${1}pid=$!; nb_echo \"+[$!] ($1) &\";"; }
+xwait () { eval "nb_echo \"+[\$${1}pid] ($1)...\"; wait \$${1}pid;"; }
 
 while true; do
 	case "$1" in
diff --git a/debian/changelog b/debian/changelog
index 1e15d90..efc7461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chiark-utils (4.1.6) unstable; urgency=low
+
+  * backup/snaprsync: work around bug in bash (Debian #382798).
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon, 14 Aug 2006 00:43:00 +0100
+
 chiark-utils (4.1.5) unstable; urgency=low
 
   * expire-iso8601 - new script.