summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Dh_Getopt.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-09-01 13:40:52 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-09-01 13:45:53 -0400
commit71e10953d25187a6528623dbd49901a89463426c (patch)
tree961d17313aefe50842c1df40837d81b488630d8a /Debian/Debhelper/Dh_Getopt.pm
parenta432550b565cd01d4a67b8cb929f90fa29d299f7 (diff)
-a == -s
The -a flag now does the same thing as the -s flag, so debhelper users do not need to worry about using the -s flag when building a package that only builds for some architectures, and dh will also work in that situation. Closes: #540794
Diffstat (limited to 'Debian/Debhelper/Dh_Getopt.pm')
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm10
1 files changed, 3 insertions, 7 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 6e5cacd..edb3be7 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.");