X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FDh_Getopt.pm;h=257fe6493c8d6de61600dbf3c0f596837c7f5882;hb=76ef1cbd64829ee4a5156a5fc4b887bcba6b974f;hp=55e37fd22a86ec42bd7fb974306308139a3a5d30;hpb=6c051826f3241caa4afc982d402682101c63c7e3;p=debhelper.git diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index 55e37fd..257fe64 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,16 @@ 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; + 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 @{$options{DOPACKAGES}}, $value; - } - elsif ($option eq 's' or $option eq 'same-arch') { - push @{$options{DOPACKAGES}}, getpackages('same'); - $options{DOSAME}=1; + push @{$dh{DOPACKAGES}}, $value; } else { error("bad option $option - should never happen!\n"); @@ -50,7 +43,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,26 +53,33 @@ 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; + $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; - - my $ret=GetOptions( - "v" => \$options{VERBOSE}, - "verbose" => \$options{VERBOSE}, +sub getoptions { + my $array=shift; + my %params=@_; + + if (! exists $params{bundling} || $params{bundling}) { + Getopt::Long::config("bundling"); + } + + my @test; + my %options=( + "v" => \$dh{VERBOSE}, + "verbose" => \$dh{VERBOSE}, + + "no-act" => \$dh{NO_ACT}, "i" => \&AddPackage, "indep" => \&AddPackage, @@ -89,122 +89,157 @@ sub parseopts { "p=s" => \&AddPackage, "package=s" => \&AddPackage, + + "N=s" => \&ExcludePackage, + "no-package=s" => \&ExcludePackage, + + "remaining-packages" => \$dh{EXCLUDE_LOGGED}, "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}, + "d" => \$dh{D_FLAG}, - "r" => \$options{R_FLAG}, - "no-restart-on-upgrade" => \$options{R_FLAG}, - "no-start" => \$options{NO_START}, - - "k" => \$options{K_FLAG}, - "keep" => \$options{K_FLAG}, - "keep-debug" => \$options{K_FLAG}, + "k" => \$dh{K_FLAG}, + "keep" => \$dh{K_FLAG}, - "P=s" => \$options{TMPDIR}, - "tmpdir=s" => \$options{TMPDIR}, + "P=s" => \$dh{TMPDIR}, + "tmpdir=s" => \$dh{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}, + "u=s", => \$dh{U_PARAMS}, - "l=s", => \$options{L_PARAMS}, + "V:s", => \$dh{V_FLAG}, - "m=s", => \$options{M_PARAMS}, - "major=s" => \$options{M_PARAMS}, + "A" => \$dh{PARAMS_ALL}, + "all" => \$dh{PARAMS_ALL}, + + "priority=s" => \$dh{PRIORITY}, + + "h|help" => \&showhelp, - "V:s", => \$options{V_FLAG}, - "version-info:s" => \$options{V_FLAG}, + "mainpackage=s" => \$dh{MAINPACKAGE}, - "A" => \$options{PARAMS_ALL}, - "all" => \$options{PARAMS_ALL}, + "name=s" => \$dh{NAME}, - "no-act" => \$options{NO_ACT}, - - "init-script=s" => \$options{INIT_SCRIPT}, + "error-handler=s" => \$dh{ERROR_HANDLER}, - "sourcedir=s" => \$options{SOURCEDIR}, - - "destdir=s" => \$options{DESTDIR}, + "ignore=s" => \&AddIgnore, - "filename=s" => \$options{FILENAME}, - - "priority=s" => \$options{PRIORITY}, - - "flavor=s" => \$options{FLAVOR}, + "O=s" => sub { push @test, $_[1] }, + + (ref $params{options} ? %{$params{options}} : ()) , - "autodest" => \$options{AUTODEST}, + "<>" => \&NonOption, + ); - "h|help" => \&showhelp, + if ($params{test}) { + foreach my $key (keys %options) { + $options{$key}=sub {}; + } + } - "mainpackage=s" => \$options{MAINPACKAGE}, + my $oldwarn; + if ($params{test} || $params{ignore_unknown_options}) { + $oldwarn=$SIG{__WARN__}; + $SIG{__WARN__}=sub {}; + } + my $ret=Getopt::Long::GetOptionsFromArray($array, %options); + if ($oldwarn) { + $SIG{__WARN__}=$oldwarn; + } - "list-missing" => \$options{LIST_MISSING}, + foreach my $opt (@test) { + # Try to parse an option, and skip it + # if it is not known. + if (getoptions([$opt], %params, + ignore_unknown_options => 0, + test => 1)) { + getoptions([$opt], %params); + } + } - "fail-missing" => \$options{FAIL_MISSING}, - - "L|libpackage=s" => \$options{LIBPACKAGE}, - - "name=s" => \$options{NAME}, - - "error-handler=s" => \$options{ERROR_HANDLER}, - - "add-udeb=s" => \$options{SHLIBS_UDEB}, - - "language=s" => \$options{LANGUAGE}, + return 1 if $params{ignore_unknown_options}; + return $ret; +} - "until=s" => \$options{UNTIL}, - "after=s" => \$options{AFTER}, - "before=s" => \$options{BEFORE}, - "remaining" => \$options{REMAINING}, +sub split_options_string { + my $str=shift; + $str=~s/^\s+//; + return split(/\s+/,$str); +} - "<>" => \&NonOption, - ); +# Parse options and set %dh values. +sub parseopts { + my %params=@_; + + my @ARGV_extra; + + # DH_INTERNAL_OPTIONS is used to pass additional options from + # dh through an override target to a command. + if (defined $ENV{DH_INTERNAL_OPTIONS}) { + @ARGV_extra=split(/\x1e/, $ENV{DH_INTERNAL_OPTIONS}); + getoptions(\@ARGV_extra, %params); + + # Avoid forcing acting on packages specified in + # DH_INTERNAL_OPTIONS. This way, -p can be specified + # at the command line to act on a specific package, but when + # nothing is specified, the excludes will cause the set of + # packages DH_INTERNAL_OPTIONS specifies to be acted on. + if (defined $dh{DOPACKAGES}) { + foreach my $package (getpackages()) { + if (! grep { $_ eq $package } @{$dh{DOPACKAGES}}) { + $exclude_package{$package}=1; + } + } + } + delete $dh{DOPACKAGES}; + delete $dh{DOINDEP}; + delete $dh{DOARCH}; + } + + # DH_OPTIONS can contain additional options to be parsed like @ARGV + if (defined $ENV{DH_OPTIONS}) { + @ARGV_extra=split_options_string($ENV{DH_OPTIONS}); + my $ret=getoptions(\@ARGV_extra, %params); + if (!$ret) { + warning("warning: ignored unknown options in DH_OPTIONS"); + } + } + my $ret=getoptions(\@ARGV, %params); if (!$ret) { - error("unknown option; aborting"); + if (! compat(7)) { + 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}) { # User specified that all arch (in)dep package be # built, and there are none of that type. - warning("I have no package to build"); + warning("You asked that all arch in(dep) packages be built, but there are none of that type."); exit(0); } - push @{$options{DOPACKAGES}},getpackages(); + push @{$dh{DOPACKAGES}},getpackages("both"); } # Remove excluded packages from the list of packages to act on. @@ -213,7 +248,11 @@ sub parseopts { my @package_list; my $package; my %packages_seen; - foreach $package (@{$options{DOPACKAGES}}) { + foreach $package (@{$dh{DOPACKAGES}}) { + if (defined($dh{EXCLUDE_LOGGED}) && + grep { $_ eq basename($0) } load_log($package)) { + $exclude_package{$package}=1; + } if (! $exclude_package{$package}) { if (! exists $packages_seen{$package}) { $packages_seen{$package}=1; @@ -221,32 +260,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}}) { - error("I have no package to build"); + if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) { + warning("No packages to build."); + exit(0); } - 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 { - # Enable bundling of short command line options. - Getopt::Long::config("bundling"); -} - 1