From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 16 Aug 2009 16:56:01 +0000 (-0400)
Subject: dh: Display $@ error if addon load fails. Closes: #541845
X-Git-Tag: 7.3.14~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5e3b38634b5b0a24b30d59b13ac7164dc613afb0;p=debhelper.git

dh: Display $@ error if addon load fails. Closes: #541845
---

diff --git a/debian/changelog b/debian/changelog
index 2df2c62..56f3b40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ debhelper (7.3.14) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * Run pod2man with --utf8. Closes: #541270
+  * dh: Display $@ error if addon load fails. Closes: #541845
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 13 Aug 2009 09:00:24 +0100
 
diff --git a/dh b/dh
index 9a6af32..bdd78c5 100755
--- a/dh
+++ b/dh
@@ -362,7 +362,7 @@ foreach my $addon (@{$dh{WITH}}) {
 	$mod=~s/-/_/g;
 	eval "use $mod";
 	if ($@) {
-		error("--with $addon not supported or failed to load module $mod");
+		error("unable to load addon $addon: $@");
 	}
 }