martin f. krafft: fix bugscript and #537734

Martin F. Krafft madduck at alioth.debian.org
Tue Oct 27 19:21:43 UTC 2009


Module: mdadm
Branch: master
Commit: 923ab3b75f61dc2e257cf4585beabb680927a22e
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=923ab3b75f61dc2e257cf4585beabb680927a22e

Author: martin f. krafft <madduck at debian.org>
Date:   Tue Oct 27 20:08:50 2009 +0100

fix bugscript and #537734

Signed-off-by: martin f. krafft <madduck at debian.org>

---

 debian/bugscript.in |    6 +++---
 debian/changelog    |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/bugscript.in b/debian/bugscript.in
index 50d19e8..478cc32 100755
--- a/debian/bugscript.in
+++ b/debian/bugscript.in
@@ -38,7 +38,7 @@ if [ $(id -u) != 0 ]; then
     yesno "Gather system information as root using sudo? (Y/n) " yep
     if [ "$REPLY" = yep ]; then
       echo running sudo "$0" "$@"...
-      sudo "$0" "$@" && exit 0
+      sudo "$0" "$@" >&3 && exit 0
       echo "sudo invocation failed, trying /bin/su..."
     fi
   fi
@@ -47,8 +47,8 @@ if [ $(id -u) != 0 ]; then
   if [ "$REPLY" = yep ]; then
     ARGS=
     for i in "$@"; do ARGS="${ARGS:+$ARGS }'$1'"; shift; done
-    echo "running su root -s '/bin/sh -c $0 $ARGS'..."
-    su root -s /bin/sh -c "$0 $ARGS" && exit 0
+    echo "running su root -s '/bin/sh -c $0${ARGS:+ $ARGS}'..."
+    su root -s /bin/sh -c "$0 $ARGS" >&3 && exit 0
     unset ARGS
     echo "su invocation failed."
   fi
diff --git a/debian/changelog b/debian/changelog
index 03c1f2f..7dc8101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mdadm (3.0.3-1) unstable; urgency=low
     (closes: #541884), and add util-linux dependency.
   * Copy udev rules into initramfs, which udev stopped doing
     (closes: #549535, #549083, #538843, #538143).
+  * Fix the bug script to write debug information to the correct file
+    descriptor (closes: #537734).
   * Switch to TopGit and split Debian diff into topic branches; add
     README.source.
   * Drop the outdated rootraiddoc.97.html document.




More information about the pkg-mdadm-commits mailing list