systemd.bug-script: Capture stderr of systemd-{delta,analyze}

Closes: #771498

diff --git a/debian/changelog b/debian/changelog
index 64185697852a49482f785c137e5bed6e974119b6..a9f4cf87d8a84e1ef646609a66e752dadc66164a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ systemd (217-2) UNRELEASED; urgency=medium
   * Import v217-stable patches (up to commit bfb4c47 from 2014-11-07).
   * Disable AppArmor again. This first requires moving libapparmor to /lib
     (see #771667). (Closes: #771652)
+  * systemd.bug-script: Capture stderr of systemd-{delta,analyze}.
+    (Closes: #771498)
 
  -- Martin Pitt <mpitt@debian.org>  Fri, 28 Nov 2014 14:46:30 +0100
 

diff --git a/debian/systemd.bug-script b/debian/systemd.bug-script
index 3b66b02ad46d80bbcecb8af90c8dfe23a9db315a..99e66daecac89bc9ece9ca1d0c99c48b922edcaf 100644 (file)
--- a/debian/systemd.bug-script
+++ b/debian/systemd.bug-script
@@ -32,11 +32,11 @@ if dpkg --compare-versions "$REPORTBUG_VERSION" ge "6.5.0"; then
     echo "-- BEGIN ATTACHMENTS --" >&3
 
     # remove highlighting escape codes from systemd-delta output
-    systemd-delta --no-pager|sed "s%\x1b[^m]*m%%g" >$DIR/systemd-delta.txt
+    systemd-delta --no-pager|sed "s%\x1b[^m]*m%%g" >$DIR/systemd-delta.txt 2>&1
     echo "$DIR/systemd-delta.txt" >&3
 
     if [ -d /run/systemd/system ]; then
-        systemd-analyze --no-pager dump >$DIR/systemd-analyze-dump.txt
+        systemd-analyze --no-pager dump >$DIR/systemd-analyze-dump.txt 2>&1
         echo "$DIR/systemd-analyze-dump.txt" >&3
     fi
 
@@ -57,12 +57,12 @@ else
 
     _header "systemd-delta"
     # remove highlighting escape codes from systemd-delta output
-    systemd-delta --no-pager|sed "s%\x1b[^m]*m%%g" >&3
+    systemd-delta --no-pager|sed "s%\x1b[^m]*m%%g" >&3 2>&3
 
     if [ -d /run/systemd/system ]; then
         echo >&3
         _header "systemd-analyze dump"
-        systemd-analyze --no-pager dump >&3
+        systemd-analyze --no-pager dump >&3 2>&3
     fi
 
     if [ -d /var/lib/systemd/deb-systemd-helper-enabled ]; then