From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 31 Mar 2010 20:09:47 +0000 (-0400)
Subject: dh: Allow --list-addons to be used when not in a source package. Closes: #574351
X-Git-Tag: 7.4.16~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=28dd5ab8b92bad4440c328a777e4e960f6363c58;p=debhelper.git

dh: Allow --list-addons to be used when not in a source package. Closes: #574351
---

diff --git a/debian/changelog b/debian/changelog
index 358282e..6250450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ debhelper (7.4.16) UNRELEASED; urgency=low
     packages that can be built for the current architecture. This change
     is mostly useful when using minimal rules files with dh. Closes: #572077
   * dh_md5sums: Sort to ensure stable, more diffable order. Closes: #573702
+  * dh: Allow --list-addons to be used when not in a source package.
+    Closes: #574351
 
  -- Joey Hess <joeyh@debian.org>  Thu, 18 Feb 2010 17:53:27 -0500
 
diff --git a/dh b/dh
index bcac8da..4f2b987 100755
--- a/dh
+++ b/dh
@@ -247,8 +247,8 @@ init(options => {
 			my ($option,$value)=@_;
 			@{$dh{WITH}} = grep { $_ ne $value } @{$dh{WITH}};
 		},
-		"l" => \$dh{LIST},
-		"list" => \$dh{LIST},
+		"l" => \&list_addons,
+		"list" => \&list_addons,
 	},
 	# Disable complaints about unknown options; they are passed on the
 	# debhelper commands.
@@ -397,7 +397,7 @@ sub remove_command_options {
 	}
 }
 
-if ($dh{LIST}) {
+sub list_addons {
 	my %addons;
 
 	for my $inc (@INC) {