diff options
Diffstat (limited to 'Debian/Debhelper/Dh_Getopt.pm')
| -rw-r--r-- | Debian/Debhelper/Dh_Getopt.pm | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index 06898923..257fe649 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; |