summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm210
-rw-r--r--Debian/Debhelper/Dh_Lib.pm36
2 files changed, 110 insertions, 136 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 3221a962..afad4b3c 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -9,12 +9,8 @@ use strict;
use Debian::Debhelper::Dh_Lib;
use Getopt::Long;
-use Exporter;
-#use vars qw{@ISA @EXPORT};
-#@ISA=qw(Exporter);
-#@EXPORT=qw(&aparseopts); # FIXME: for some reason, this doesn't work.
-my (%options, %exclude_package);
+my %exclude_package;
sub showhelp {
my $prog=basename($0);
@@ -29,19 +25,19 @@ sub showhelp {
# order.
sub AddPackage { my($option,$value)=@_;
if ($option eq 'i' or $option eq 'indep') {
- push @{$options{DOPACKAGES}}, getpackages('indep');
- $options{DOINDEP}=1;
+ push @{$dh{DOPACKAGES}}, getpackages('indep');
+ $dh{DOINDEP}=1;
}
elsif ($option eq 'a' or $option eq 'arch') {
- push @{$options{DOPACKAGES}}, getpackages('arch');
- $options{DOARCH}=1;
+ push @{$dh{DOPACKAGES}}, getpackages('arch');
+ $dh{DOARCH}=1;
}
elsif ($option eq 'p' or $option eq 'package') {
- push @{$options{DOPACKAGES}}, $value;
+ push @{$dh{DOPACKAGES}}, $value;
}
elsif ($option eq 's' or $option eq 'same-arch') {
- push @{$options{DOPACKAGES}}, getpackages('same');
- $options{DOSAME}=1;
+ push @{$dh{DOPACKAGES}}, getpackages('same');
+ $dh{DOSAME}=1;
}
else {
error("bad option $option - should never happen!\n");
@@ -50,7 +46,7 @@ sub AddPackage { my($option,$value)=@_;
# Adds packages to the list of debug packages.
sub AddDebugPackage { my($option,$value)=@_;
- push @{$options{DEBUGPACKAGES}}, $value;
+ push @{$dh{DEBUGPACKAGES}}, $value;
}
# Add a package to a list of packages that should not be acted on.
@@ -60,39 +56,28 @@ sub ExcludePackage { my($option,$value)=@_;
# Add another item to the exclude list.
sub AddExclude { my($option,$value)=@_;
- push @{$options{EXCLUDE}},$value;
+ push @{$dh{EXCLUDE}},$value;
}
# Add a file to the ignore list.
sub AddIgnore { my($option,$file)=@_;
- $options{IGNORE}->{$file}=1;
-}
-
-# Add an item to the with list.
-sub AddWith { my($option,$value)=@_;
- push @{$options{WITH}},$value;
+ $dh{IGNORE}->{$file}=1;
}
# This collects non-options values.
sub NonOption {
- push @{$options{ARGV}}, @_;
+ push @{$dh{ARGV}}, @_;
}
-# Parse options and return a hash of the values.
-sub parseopts {
- undef %options;
+sub getoptions {
+ my $array=shift;
+ my %options=%{shift()} if ref $_[0];
- # DH_INTERNAL_OPTIONS is used to pass additional options from
- # dh through an override target to a command.
- if (defined $ENV{DH_INTERNAL_OPTIONS}) {
- $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//;
- $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//;
- unshift @ARGV, split(/\s+/,$ENV{DH_INTERNAL_OPTIONS});
- }
-
- my $ret=GetOptions(
- "v" => \$options{VERBOSE},
- "verbose" => \$options{VERBOSE},
+ Getopt::Long::GetOptionsFromArray($array,
+ "v" => \$dh{VERBOSE},
+ "verbose" => \$dh{VERBOSE},
+
+ "no-act" => \$dh{NO_ACT},
"i" => \&AddPackage,
"indep" => \&AddPackage,
@@ -102,124 +87,109 @@ sub parseopts {
"p=s" => \&AddPackage,
"package=s" => \&AddPackage,
+
+ "N=s" => \&ExcludePackage,
+ "no-package=s" => \&ExcludePackage,
"dbg-package=s" => \&AddDebugPackage,
"s" => \&AddPackage,
"same-arch" => \&AddPackage,
- "N=s" => \&ExcludePackage,
- "no-package=s" => \&ExcludePackage,
-
- "n" => \$options{NOSCRIPTS},
- "noscripts" => \$options{NOSCRIPTS},
- "o" => \$options{ONLYSCRIPTS},
- "onlyscripts" => \$options{ONLYSCRIPTS},
+ "n" => \$dh{NOSCRIPTS},
+ "noscripts" => \$dh{NOSCRIPTS},
+ "o" => \$dh{ONLYSCRIPTS},
+ "onlyscripts" => \$dh{ONLYSCRIPTS},
- "x" => \$options{INCLUDE_CONFFILES}, # is -x for some unknown historical reason..
- "include-conffiles" => \$options{INCLUDE_CONFFILES},
-
"X=s" => \&AddExclude,
"exclude=s" => \&AddExclude,
- "ignore=s" => \&AddIgnore,
-
- "d" => \$options{D_FLAG},
- "remove-d" => \$options{D_FLAG},
- "dirs-only" => \$options{D_FLAG},
-
- "r" => \$options{R_FLAG},
- "no-restart-on-upgrade" => \$options{R_FLAG},
- "no-start" => \$options{NO_START},
- "R|restart-after-upgrade" => \$options{RESTART_AFTER_UPGRADE},
+ "d" => \$dh{D_FLAG},
- "k" => \$options{K_FLAG},
- "keep" => \$options{K_FLAG},
- "keep-debug" => \$options{K_FLAG},
-
- "P=s" => \$options{TMPDIR},
- "tmpdir=s" => \$options{TMPDIR},
-
- "u=s", => \$options{U_PARAMS},
- "update-rcd-params=s", => \$options{U_PARAMS},
- "dpkg-shlibdeps-params=s", => \$options{U_PARAMS},
- "dpkg-gencontrol-params=s", => \$options{U_PARAMS},
-
- "l=s", => \$options{L_PARAMS},
+ "k" => \$dh{K_FLAG},
+ "keep" => \$dh{K_FLAG},
- "m=s", => \$options{M_PARAMS},
- "major=s" => \$options{M_PARAMS},
+ "P=s" => \$dh{TMPDIR},
+ "tmpdir=s" => \$dh{TMPDIR},
- "V:s", => \$options{V_FLAG},
- "version-info:s" => \$options{V_FLAG},
+ "u=s", => \$dh{U_PARAMS},
- "A" => \$options{PARAMS_ALL},
- "all" => \$options{PARAMS_ALL},
+ "V:s", => \$dh{V_FLAG},
- "no-act" => \$options{NO_ACT},
+ "A" => \$dh{PARAMS_ALL},
+ "all" => \$dh{PARAMS_ALL},
- "init-script=s" => \$options{INIT_SCRIPT},
+ "sourcedir=s" => \$dh{SOURCEDIR},
- "sourcedir=s" => \$options{SOURCEDIR},
+ "destdir=s" => \$dh{DESTDIR},
- "destdir=s" => \$options{DESTDIR},
-
- "filename=s" => \$options{FILENAME},
-
- "priority=s" => \$options{PRIORITY},
+ "priority=s" => \$dh{PRIORITY},
- "flavor=s" => \$options{FLAVOR},
-
- "autodest" => \$options{AUTODEST},
-
"h|help" => \&showhelp,
- "mainpackage=s" => \$options{MAINPACKAGE},
+ "mainpackage=s" => \$dh{MAINPACKAGE},
- "list-missing" => \$options{LIST_MISSING},
+ "name=s" => \$dh{NAME},
- "fail-missing" => \$options{FAIL_MISSING},
-
- "L|libpackage=s" => \$options{LIBPACKAGE},
-
- "name=s" => \$options{NAME},
+ "error-handler=s" => \$dh{ERROR_HANDLER},
- "error-handler=s" => \$options{ERROR_HANDLER},
-
- "add-udeb=s" => \$options{SHLIBS_UDEB},
-
- "language=s" => \$options{LANGUAGE},
+ "ignore=s" => \&AddIgnore,
- "until=s" => \$options{UNTIL},
- "after=s" => \$options{AFTER},
- "before=s" => \$options{BEFORE},
- "remaining" => \$options{REMAINING},
- "with=s" => \&AddWith,
+ %options,
"<>" => \&NonOption,
- );
+ )
+}
+
+# Parse options and set %dh values.
+sub parseopts {
+ my $options=shift;
+ # DH_OPTIONS can contain additional options
+ # to be parsed like @ARGV, but with unknown options
+ # skipped.
+ my @ARGV_extra;
+ if (defined $ENV{DH_OPTIONS}) {
+ $ENV{DH_OPTIONS}=~s/^\s+//;
+ $ENV{DH_OPTIONS}=~s/\s+$//;
+ @ARGV_extra=split(/\s+/,$ENV{DH_OPTIONS});
+ my $ret=getoptions(\@ARGV_extra, $options);
+ if (!$ret) {
+ warning("warning: ignored unknown options in DH_OPTIONS");
+ }
+ }
+
+ # DH_INTERNAL_OPTIONS is used to pass additional options from
+ # dh through an override target to a command.
+ if (defined $ENV{DH_INTERNAL_OPTIONS}) {
+ $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//;
+ $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//;
+ unshift @ARGV, split(/\s+/,$ENV{DH_INTERNAL_OPTIONS});
+ }
+
+ my $ret=getoptions(\@ARGV, $options);
if (!$ret) {
- error("unknown option; aborting");
+ warning("warning: unknown options will be a fatal error in a future debhelper release");
+ #error("unknown option; aborting");
}
# Check to see if -V was specified. If so, but no parameters were
# passed, the variable will be defined but empty.
- if (defined($options{V_FLAG})) {
- $options{V_FLAG_SET}=1;
+ if (defined($dh{V_FLAG})) {
+ $dh{V_FLAG_SET}=1;
}
# If we have not been given any packages to act on, assume they
# want us to act on them all. Note we have to do this before excluding
# packages out, below.
- if (! defined $options{DOPACKAGES} || ! @{$options{DOPACKAGES}}) {
- if ($options{DOINDEP} || $options{DOARCH} || $options{DOSAME}) {
+ if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
+ if ($dh{DOINDEP} || $dh{DOARCH} || $dh{DOSAME}) {
# User specified that all arch (in)dep package be
# built, and there are none of that type.
warning("I have no package to build");
exit(0);
}
- push @{$options{DOPACKAGES}},getpackages();
+ push @{$dh{DOPACKAGES}},getpackages();
}
# Remove excluded packages from the list of packages to act on.
@@ -228,7 +198,7 @@ sub parseopts {
my @package_list;
my $package;
my %packages_seen;
- foreach $package (@{$options{DOPACKAGES}}) {
+ foreach $package (@{$dh{DOPACKAGES}}) {
if (! $exclude_package{$package}) {
if (! exists $packages_seen{$package}) {
$packages_seen{$package}=1;
@@ -236,27 +206,25 @@ sub parseopts {
}
}
}
- @{$options{DOPACKAGES}}=@package_list;
+ @{$dh{DOPACKAGES}}=@package_list;
# If there are no packages to act on now, it's an error.
- if (! defined $options{DOPACKAGES} || ! @{$options{DOPACKAGES}}) {
+ if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
error("I have no package to build");
}
- if (defined $options{U_PARAMS}) {
+ if (defined $dh{U_PARAMS}) {
# Split the U_PARAMS up into an array.
- my $u=$options{U_PARAMS};
- undef $options{U_PARAMS};
- push @{$options{U_PARAMS}}, split(/\s+/,$u);
+ my $u=$dh{U_PARAMS};
+ undef $dh{U_PARAMS};
+ push @{$dh{U_PARAMS}}, split(/\s+/,$u);
}
# Anything left in @ARGV is options that appeared after a --
# These options are added to the U_PARAMS array, while the
# non-option values we collected replace them in @ARGV;
- push @{$options{U_PARAMS}}, @ARGV;
- @ARGV=@{$options{ARGV}} if exists $options{ARGV};
-
- return %options;
+ push @{$dh{U_PARAMS}}, @ARGV, @ARGV_extra;
+ @ARGV=@{$dh{ARGV}} if exists $dh{ARGV};
}
sub import {
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 871adf48..a11c36a3 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -20,23 +20,18 @@ use vars qw(@ISA @EXPORT %dh);
my $max_compat=7;
sub init {
- # If DH_OPTIONS is set, prepend it @ARGV.
- if (defined($ENV{DH_OPTIONS})) {
- # Ignore leading/trailing whitespace.
- $ENV{DH_OPTIONS}=~s/^\s+//;
- $ENV{DH_OPTIONS}=~s/\s+$//;
- unshift @ARGV,split(/\s+/,$ENV{DH_OPTIONS});
- }
+ my %params=@_;
- # Check to see if an argument on the command line starts with a dash.
- # if so, we need to pass this off to the resource intensive
+ # Check to see if an option line starts with a dash,
+ # or DH_OPTIONS is set.
+ # If so, we need to pass this off to the resource intensive
# Getopt::Long, which I'd prefer to avoid loading at all if possible.
if ((defined $ENV{DH_OPTIONS} && length $ENV{DH_OPTIONS}) ||
(defined $ENV{DH_INTERNAL_OPTIONS} && length $ENV{DH_INTERNAL_OPTIONS}) ||
grep /^-/, @ARGV) {
eval "use Debian::Debhelper::Dh_Getopt";
- error($!) if $@;
- %dh=Debian::Debhelper::Dh_Getopt::parseopts();
+ error($@) if $@;
+ Debian::Debhelper::Dh_Getopt::parseopts($params{options});
}
# Another way to set excludes.
@@ -167,8 +162,7 @@ sub doit {
verbose_print(escape_shell(@_));
if (! $dh{NO_ACT}) {
- my $ret=system(@_);
- $ret == 0 || error("command returned error code $ret");
+ system(@_) == 0 || _error_exitcode($_[0]);
}
}
@@ -181,11 +175,23 @@ sub complex_doit {
if (! $dh{NO_ACT}) {
# The join makes system get a scalar so it forks off a shell.
- system(join(" ",@_)) == 0
- || error("command returned error code");
+ system(join(" ", @_)) == 0 || _error_exitcode(join(" ", @_))
}
}
+sub _error_exitcode {
+ my $command=shift;
+ if ($? == -1) {
+ error("$command failed to to execute: $!");
+ }
+ elsif ($? & 127) {
+ error("$command died with signal ".($? & 127));
+ }
+ else {
+ error("$command returned exit code ".($? >> 8));
+ }
+}
+
# Run a command that may have a huge number of arguments, like xargs does.
# Pass in a reference to an array containing the arguments, and then other
# parameters that are the command and any parameters that should be passed to
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 21:35:02 +0000