clean up --sourcedir/--sourcedirectory conflict

[debhelper.git] / Debian / Debhelper / Dh_Getopt.pm

diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index bddc06b8102bd3aaf63e43cb7f0dee9e581c3451..9868124cbf996ed82c88b9c9207af94ecbb803ab 100644 (file)
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -71,9 +71,9 @@ sub NonOption {
 
 sub getoptions {
        my $array=shift;
-       my $extraoptions=shift;
+       my %options=%{shift()} if ref $_[0];
 
-       my %options=(
+       Getopt::Long::GetOptionsFromArray($array,
                "v" => \$dh{VERBOSE},
                "verbose" => \$dh{VERBOSE},
 
@@ -121,10 +121,6 @@ sub getoptions {
                "A" => \$dh{PARAMS_ALL},
                "all" => \$dh{PARAMS_ALL},
        
-               "sourcedir=s" => \$dh{SOURCEDIR},
-               
-               "destdir=s" => \$dh{DESTDIR},
-               
                "priority=s" => \$dh{PRIORITY},
                
                "h|help" => \&showhelp,
@@ -137,35 +133,21 @@ sub getoptions {
                
                "ignore=s" => \&AddIgnore,
 
-               "<>" => \&NonOption,
-       );
-       
-       # Merge extra options and cancel default ones as needed (undef)
-       if (defined $extraoptions) {
-               for my $opt (keys %$extraoptions) {
-                       if (defined $extraoptions->{$opt}) {
-                               $options{$opt}=$extraoptions->{$opt};
-                       }
-                       else {
-                               delete $options{$opt};
-                       }
-               }
-       }
+               %options,
 
-       Getopt::Long::GetOptionsFromArray($array, %options);
+               "<>" => \&NonOption,
+       )
 }
 
 sub split_options_string {
        my $str=shift;
-
        $str=~s/^\s+//;
-       return map { $_=~s/\\(\s)/$1/g; $_=~s/\s+$//g; $_ } split(/(?<!\\)\s+/,$str);
+       return split(/\s+/,$str);
 }
 
 # Parse options and set %dh values.
 sub parseopts {
        my $options=shift;
-       my $extra_args=shift;
        
        my @ARGV_extra;
 
@@ -173,11 +155,11 @@ sub parseopts {
        # dh through an override target to a command.
        if (defined $ENV{DH_INTERNAL_OPTIONS}) {
                @ARGV_extra=split_options_string($ENV{DH_INTERNAL_OPTIONS});
-               my $ret=getoptions(\@ARGV_extra, $options);
-               if (!$ret) {
-                       warning("warning: unknown options will be a fatal error in a future debhelper release");
-                       #error("unknown option; aborting");
-               }
+               # Unknown options will be silently ignored.
+               my $oldwarn=$SIG{__WARN__};
+               $SIG{__WARN__}=sub {};
+               getoptions(\@ARGV_extra, $options);
+               $SIG{__WARN__}=$oldwarn;
 
                # Avoid forcing acting on packages specified in
                # DH_INTERNAL_OPTIONS. This way, -p can be specified
@@ -208,15 +190,6 @@ sub parseopts {
                }
        }
 
-       if (defined $extra_args) {
-               my @extra_opts=split_options_string($extra_args);
-               my $ret=getoptions(\@extra_opts, $options);
-               if (!$ret) {
-                       warning("warning: ignored unknown options");
-               }
-               push @ARGV_extra, @extra_opts;
-       }
-
        my $ret=getoptions(\@ARGV, $options);
        if (!$ret) {
                warning("warning: unknown options will be a fatal error in a future debhelper release");