annotate-output should preserve whitespace

Bug #1120917 reported by Alex Dehnert
12
This bug affects 2 people
Affects Status Importance Assigned to Milestone
devscripts (Ubuntu)
Fix Released
Medium
Unassigned

Bug Description

annotate-output currently clobbers line-initial whitespace, and also interprets backslash sequences:
adehnert@esp:~$ annotate-output echo ' foo\\'
01:37:31 I: Started echo foo\\
01:37:31 O: foo\
01:37:31 I: Finished with exitcode 0

I believe the attached patch fixes both these issues.

Thanks,
Alex

Tags: patch
Revision history for this message
Alex Dehnert (adehnert) wrote :
Revision history for this message
Ubuntu Foundations Team Bug Bot (crichton) wrote :

The attachment "annotate-output.patch" of this bug report has been identified as being a patch. The ubuntu-reviewers team has been subscribed to the bug report so that they can review the patch. In the event that this is in fact not a patch you can resolve this situation by removing the tag 'patch' from the bug report and editing the attachment so that it is not flagged as a patch. Additionally, if you are member of the ubuntu-reviewers team please also unsubscribe the team from this bug report.

[This is an automated message performed by a Launchpad user owned by Brian Murray. Please contact him regarding any issues with the action taken in this bug report.]

tags: added: patch
Benjamin Drung (bdrung)
Changed in devscripts (Ubuntu):
importance: Undecided → Medium
status: New → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :
Download full text (4.3 KiB)

This bug was fixed in the package devscripts - 2.13.0ubuntu1

---------------
devscripts (2.13.0ubuntu1) raring; urgency=low

  * Merge from Debian experimental. Remaining changes:
    - Convert python scripts to python3. (Closes: #680313)
      Debian bug #695259 needs to be fixed to get the change into Debian.

devscripts (2.13.0) experimental; urgency=low

  [ Christoph Berg ]
  * origtargz: New script: fetch the orig tarball of a Debian package from
    various sources, and unpack it
  * debcommit: --changelog-info will pass --author and --date for git commits.

  [ James McCoy ]
  * licensecheck: Recognize MPL 2.0 licenses. Thanks to Ryan Pavlik for the
    patch. (Closes: #687664)
  * namecheck: Check Apache's projects page for names. (Closes: #686862)
  * debcommit:
    + Drop checks for old dpkg versions and always use the necessary Perl
      modules (Dpkg::Changelog::Parse, Dpkg::Vendor::Ubuntu,
      Dpkg::Changelog::Entry::Debian).
    + 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)
    + 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)

  [ Dmitry Smirnov ]
  * licensecheck:
    + Remove any regular comments pattern. (Closes: #526698)
    + Improve command line parsing.
    + Fix GPL license version detection bug.
    + Fix BSD-3-clause detection.

  [ Paul Wise ]
  * checkbashisms: When examining a bash script, indicate the lack of use of
    bashisms.
  * uscan:
    + Access GitHub directly instead of using githubredir.debian.net in
      example GitHub watch URL.
    + Add an example watch URL that matches the various file extensions used
      by common archive formats.
    + Add an example watch URL for Google Code projects.

  [ Benjamin Drung ]
  * Add bashism test cases from Raphael Geissert.
  * Add autopkgtest support. (LP: #1073330)
  * suspicious-source: Add inode/symlink and image/x-xpmi to whitelisted
    mime-types.
  * wrap-and-sort:
    + Put special entries (variables and placeholders) at the end of the list.
    + Sort debian/control*.in files too.
  * licensecheck: detect (L)GPL licenses more permissively. Thanks to
    Laurent Rineau for the patch. (Closes: #659231)
  * Bump Standards-Version to 3.9.4 (no changes needed).

  [ Cyril Brulebois ]
  * Don't auto reverse diffs when DEBDIFF_AUTO_VER_SORT is set to yes, and
    when the version in both packages is the same. (Closes: #650732)

  [ Tony Mancill ]
  * debsnap: Escape the package name when used in regex. (Closes: #696018)

  [ David Prévot ]
  * Minor manpages convention fix: do not terminate the SEE ALSO lists with a
    period. (Closes: #696416)
  * French translation update.

  [ Josselin Mouette ]
  * nmudiff: Use dpkg-parsechangelog to fix manual parsing bug (Closes: #700584)

  [ Raphael Geissert ]
  * checkbashisms:
    + allow -FOO- as heredoc delimite...

Read more...

Changed in devscripts (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.