From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 28 Sep 2009 01:23:46 +0000 (-0400)
Subject: Allow dpkg-architecture to print errors to stderr. Closes: #548636
X-Git-Tag: 7.4.3~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=94779d835808c3dc91502e4abb39d79e4716dda3;p=debhelper.git

Allow dpkg-architecture to print errors to stderr. Closes: #548636
---

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 5a0b794..325c7fc 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -608,7 +608,7 @@ sub excludefile {
 
 sub dpkg_architecture_value {
 	my $var = shift;
-	my $value=`dpkg-architecture -q$var 2>/dev/null` || error("dpkg-architecture failed");
+	my $value=`dpkg-architecture -q$var` || error("dpkg-architecture failed");
 	chomp $value;
 	return $value;
 }
diff --git a/debian/changelog b/debian/changelog
index 02b0c5f..e3c3efe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ debhelper (7.4.3) UNRELEASED; urgency=low
   [ Joey Hess ]
   * dh_perl: Do not look at perl scripts under /usr/share/doc.
     Closes: #546683
+  * Allow dpkg-architecture to print errors to stderr. Closes: #548636
 
  -- Joey Hess <joeyh@debian.org>  Tue, 15 Sep 2009 13:18:35 -0400