[SCM] Git repository for devscripts branch, master, updated. v2.12.4-147-g1b55ed7
James McCoy
jamessan at debian.org
Sun Feb 17 00:48:37 UTC 2013
The following commit has been merged in the master branch:
commit 1b55ed73d0e12a045bc31789c2666cfc8297b9ca
Author: James McCoy <jamessan at debian.org>
Date: Sat Feb 16 19:47:53 2013 -0500
annotate-output: Don't swallow leading whitespace.
Closes: #695612, LP: #1120917
Signed-off-by: James McCoy <jamessan at debian.org>
diff --git a/debian/changelog b/debian/changelog
index 2cb7d26..21fa206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ devscripts (2.13.0) UNRELEASED; urgency=low
+ Handle an incomplete line of output. (Closes: #695609)
+ Don't treat backslashes in the command's output as an escape. (Closes:
#695613)
+ + Don't swallow leading whitespace. (Closes: #695612, LP: #1120917)
* dscverify: Use "gpg --status-fd" to determine if a valid signature is
found and only use the signed content. (Closes: #695914)
* wrap-and-sort: Fix repeated word in man page. (Closes: #696363)
diff --git a/scripts/annotate-output.sh b/scripts/annotate-output.sh
index abf9e55..9da1ecf 100755
--- a/scripts/annotate-output.sh
+++ b/scripts/annotate-output.sh
@@ -24,7 +24,7 @@ progname=$(basename $0)
addtime ()
{
- while read -r line; do
+ while IFS= read -r line; do
echo "`date ${FMT}` $1: $line"
done
if [ ! -z "$line" ]; then
--
Git repository for devscripts
More information about the devscripts-devel
mailing list