summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Dh_Getopt.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-05-28 15:16:52 -0400
committerJoey Hess <joey@kitenet.net>2010-05-28 15:16:52 -0400
commit1b399c04b40bc6f0fac4aa218a76c9a7132e7e71 (patch)
treeb9c95f4a0dc13d75c03e1b8fa7479a1e16efe563 /Debian/Debhelper/Dh_Getopt.pm
parent653fb43cfa731d047deaf19b61aef2ebbeb00990 (diff)
Revert "In v8 mode, debhelper only ever acts on packages that can be built for the given architecture, even if -N or -p are used to specify packages specific to other architectures."
This reverts commit 653fb43cfa731d047deaf19b61aef2ebbeb00990. Oops, I meant to not make this change.. -N was already fixed, and fixing -p does not seem important.
Diffstat (limited to 'Debian/Debhelper/Dh_Getopt.pm')
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm19
1 files changed, 8 insertions, 11 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 0689892..257fe64 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -230,9 +230,8 @@ sub parseopts {
}
# If we have not been given any packages to act on, assume they
- # want us to act on all relevant packages. Note we have to do
- # this before excluding packages out, below.
- my @packages_relevant=getpackages("both");
+ # want us to act on them all. Note we have to do this before excluding
+ # packages out, below.
if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
if ($dh{DOINDEP} || $dh{DOARCH}) {
# User specified that all arch (in)dep package be
@@ -240,27 +239,25 @@ sub parseopts {
warning("You asked that all arch in(dep) packages be built, but there are none of that type.");
exit(0);
}
- push @{$dh{DOPACKAGES}}, @packages_relevant;
+ push @{$dh{DOPACKAGES}},getpackages("both");
}
# Remove excluded packages from the list of packages to act on.
# Also unique the list, in case some options were specified that
# added a package to it twice.
- # And avoid acting on packages that are not relevant.
my @package_list;
my $package;
my %packages_seen;
- my %packages_relevant=map { $_ => 1 } @packages_relevant;
foreach $package (@{$dh{DOPACKAGES}}) {
if (defined($dh{EXCLUDE_LOGGED}) &&
grep { $_ eq basename($0) } load_log($package)) {
$exclude_package{$package}=1;
}
- if (! $exclude_package{$package} &&
- ! exists $packages_seen{$package} &&
- $packages_relevant{$package}) {
- $packages_seen{$package}=1;
- push @package_list, $package;
+ if (! $exclude_package{$package}) {
+ if (! exists $packages_seen{$package}) {
+ $packages_seen{$package}=1;
+ push @package_list, $package;
+ }
}
}
@{$dh{DOPACKAGES}}=@package_list;