diff options
Diffstat (limited to 'Debian/Debhelper')
-rw-r--r-- | Debian/Debhelper/Dh_Getopt.pm | 10 | ||||
-rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index 6e5cacdd..edb3be76 100644 --- a/Debian/Debhelper/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@ -28,17 +28,14 @@ sub AddPackage { my($option,$value)=@_; push @{$dh{DOPACKAGES}}, getpackages('indep'); $dh{DOINDEP}=1; } - elsif ($option eq 'a' or $option eq 'arch') { + elsif ($option eq 'a' or $option eq 'arch' or + $option eq 's' or $option eq 'same-arch') { push @{$dh{DOPACKAGES}}, getpackages('arch'); $dh{DOARCH}=1; } elsif ($option eq 'p' or $option eq 'package') { push @{$dh{DOPACKAGES}}, $value; } - elsif ($option eq 's' or $option eq 'same-arch') { - push @{$dh{DOPACKAGES}}, getpackages('same'); - $dh{DOSAME}=1; - } else { error("bad option $option - should never happen!\n"); } @@ -186,7 +183,6 @@ sub parseopts { delete $dh{DOPACKAGES}; delete $dh{DOINDEP}; delete $dh{DOARCH}; - delete $dh{DOSAME}; } # DH_OPTIONS can contain additional options @@ -216,7 +212,7 @@ sub parseopts { # 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} || $dh{DOSAME}) { + if ($dh{DOINDEP} || $dh{DOARCH}) { # User specified that all arch (in)dep package be # built, and there are none of that type. warning("You asked that all arch in(dep) packages be built, but there are none of that type."); diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 4ccd12ae..5a0b7947 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -667,9 +667,8 @@ sub sourcepackage { } # Returns a list of packages in the control file. -# Must pass "arch" or "indep" or "same" to specify arch-dependant or -# -independant or same arch packages. If nothing is specified, returns all -# packages. +# Pass "arch" or "indep" to specify arch-dependant or +# independant. If nothing is specified, returns all packages. # As a side effect, populates %package_arches and %package_types with the # types of all packages (not only those returned). my (%package_types, %package_arches); @@ -717,8 +716,7 @@ sub getpackages { if ($package && (($type eq 'indep' && $arch eq 'all') || - ($type eq 'arch' && $arch ne 'all') || - ($type eq 'same' && ($arch eq 'any' || + ($type eq 'arch' && ($arch eq 'any' || ($arch ne 'all' && samearch(buildarch(), $arch)))) || ! $type)) { |