@@ -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 4d2f3ecb6d01b6b44d04d723ca4ff786a268df19..e31c27b919cd0262b4907834dc82e19f4a9ff024 100755 (executable)
--- 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 1e15d9047205350d22055cee5c8042ba244489c1..efc74616b888ed10ae5add88f3a5bef89f4a8656 100644 (file)
--- 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.