From 1433215598fbec3c84be732ca5379f6eb236e775 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Jan 2014 02:21:15 +0000
Subject: [PATCH 1/1] failedcmd prints $us, not $_[0] - ie, dgit doesn't
 pretend, in the error message, to be its child.

---
 debian/changelog | 2 ++
 dgit             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index af729416..32c06809 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dgit (0.21~~iwj) unstable; urgency=medium
 
   Error message improvements:
   * Use failedcmd to report errors when ssh psql fails.  Closes:#734281.
+  * failedcmd prints $us, not $_[0] - ie, dgit doesn't pretend,
+    in the error message, to be its child.
   * Do not report the (irrelevant) $? when madison parsing fails.
 
   Packaging improvements:
diff --git a/dgit b/dgit
index 94b9ab16..0182b6f9 100755
--- a/dgit
+++ b/dgit
@@ -332,7 +332,7 @@ sub printcmd {
 }
 
 sub failedcmd {
-    { local ($!); printcmd \*STDERR, "$_[0]: failed command:", @_ or die $!; };
+    { local ($!); printcmd \*STDERR, "$us: failed command:", @_ or die $!; };
     if ($!) {
 	fail "failed to fork/exec: $!";
     } elsif (!($? & 0xff)) {
-- 
2.30.2