r1596: * Remove duplicate packages from DOPACKAGES after argument processing.

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

diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 81d206181bc5f96feae10d55e54811429955cbb2..364187a12b9b440b97695fbb86abfef45f120cd3 100644 (file)
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -19,7 +19,7 @@ my (%options, %exclude_package);
 sub showhelp {
        my $prog=basename($0);
        print "Usage: $prog [options]\n\n";
-       print "  $prog is a part of debhelper. See debhelper(1)\n";
+       print "  $prog is a part of debhelper. See debhelper(7)\n";
        print "  and $prog(1) for complete usage instructions.\n"; 
        exit(1);
 }
@@ -101,6 +101,7 @@ sub parseopts {
        
                "r" => \$options{R_FLAG},
                "no-restart-on-upgrade" => \$options{R_FLAG},
+               "no-start" => \$options{NO_START},
        
                "k" => \$options{K_FLAG},
                "keep" => \$options{K_FLAG},
@@ -141,6 +142,14 @@ sub parseopts {
                "autodest" => \$options{AUTODEST},
 
                "h|help" => \&showhelp,
+
+               "mainpackage=s" => \$options{MAINPACKAGE},
+
+               "list-missing" => \$options{LIST_MISSING},
+               
+               "L|libpackage=s" => \$options{LIBPACKAGE},
+               
+               "name=s" => \$options{NAME},
                
                "<>" => \&NonOption,
        );
@@ -166,24 +175,23 @@ sub parseopts {
                }
                push @{$options{DOPACKAGES}},GetPackages();
        }
-       
+
        # Remove excluded packages from the list of packages to act on.
+       # Also unique the list, in case some options were specified that
+       # added a package to it twice.
        my @package_list;
        my $package;
+       my %packages_seen;
        foreach $package (@{$options{DOPACKAGES}}) {
                if (! $exclude_package{$package}) {
-                       push @package_list, $package;   
+                       if (! exists $packages_seen{$package}) {
+                               $packages_seen{$package}=1;
+                               push @package_list, $package;   
+                       }
                }
        }
        @{$options{DOPACKAGES}}=@package_list;
 
-       # Generate EXCLUDE_FIND.
-       $options{EXCLUDE_FIND}='';
-       foreach (@{$options{EXCLUDE}}) {
-               $options{EXCLUDE_FIND}.="-regex .*".quotemeta($_).".* -or ";
-       }
-       $options{EXCLUDE_FIND}=~s/ -or $//;
-
        # 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");
@@ -203,7 +211,7 @@ sub parseopts {
        @ARGV=@{$options{ARGV}} if exists $options{ARGV};
 
        return %options;
-}      
+}
 
 sub import {
        # Enable bundling of short command line options.