[SCM] Git repository for devscripts branch, master, updated. v2.12.4-111-g9e31d5c

[James McCoy]

The following commit has been merged in the master branch:
commit 9e31d5c36fce94ace47d3adacb93bf5a58c14850
Author: James McCoy <jamessan at debian.org>
Date:   Mon Dec 10 19:57:06 2012 -0500

    annotate-output: Don't treat backslashes in the command's output as an escape.
    
    Closes: #695613
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 0096337..aaa22ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ devscripts (2.12.6+exp1) UNRELEASED; urgency=low
     + Add changelog info support for hg and bzr.
   * annotate-output:
     + Handle an incomplete line of output.  (Closes: #695609)
+    + Don't treat backslashes in the command's output as an escape.  (Closes:
+      #695613)
 
   [ Dmitry Smirnov ]
   * licensecheck: Remove any regular comments pattern. (Closes: #526698)
diff --git a/scripts/annotate-output.sh b/scripts/annotate-output.sh
index c91961d..abf9e55 100755
--- a/scripts/annotate-output.sh
+++ b/scripts/annotate-output.sh
@@ -24,7 +24,7 @@ progname=$(basename $0)
 
 addtime ()
 {
-	while read line; do
+	while read -r line; do
 		echo "`date ${FMT}` $1: $line"
 	done
 	if [ ! -z "$line" ]; then
diff --git a/test/test_annotate-output b/test/test_annotate-output
index 928010c..56f6a3d 100755
--- a/test/test_annotate-output
+++ b/test/test_annotate-output
@@ -30,4 +30,10 @@ testSwallowedNewline() {
   assertEquals 'incomplete line found' "${expected}" "${actual}"
 }
 
+testBackslashes() {
+  expected='% O: \f\o\o'
+  actual="$($COMMAND +%% printf '%s\n' '\f\o\o' | grep O:)"
+  assertEquals 'backslashes echoed' "${expected}" "${actual}"
+}
+
 . shunit2

-- 
Git repository for devscripts