Support debian/foo.os files to suppliment previous debian/foo.arch file support....

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

diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index afad4b3c87369bf950beef439fdd17102d492bc2..5585a54ceca1f8b6efcb595ac2c694762a10fcef 100644 (file)
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -91,6 +91,8 @@ sub getoptions {
                "N=s" => \&ExcludePackage,
                "no-package=s" => \&ExcludePackage,
        
+               "remaining-packages" => \$dh{EXCLUDE_LOGGED},
+       
                "dbg-package=s" => \&AddDebugPackage,
                
                "s" => \&AddPackage,
@@ -145,10 +147,41 @@ sub getoptions {
 sub parseopts {
        my $options=shift;
        
+       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}) {
+               $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//;
+               $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//;
+               @ARGV_extra=split(/\s+/,$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");
+               }
+
+               # 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, and if
+               # 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};
+               delete $dh{DOSAME};
+       }
+       
        # 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+$//;
@@ -159,14 +192,6 @@ sub parseopts {
                }
        }
 
-       # 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) {
                warning("warning: unknown options will be a fatal error in a future debhelper release");
@@ -186,7 +211,7 @@ sub parseopts {
                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");
+                       warning("You asked that all arch in(dep) packages be built, but there are none of that type.");
                        exit(0);
                }
                push @{$dh{DOPACKAGES}},getpackages();
@@ -199,6 +224,10 @@ sub parseopts {
        my $package;
        my %packages_seen;
        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;
@@ -208,9 +237,9 @@ sub parseopts {
        }
        @{$dh{DOPACKAGES}}=@package_list;
 
-       # If there are no packages to act on now, it's an error.
        if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
-               error("I have no package to build");
+               warning("No packages to build.");
+               exit(0);
        }
 
        if (defined $dh{U_PARAMS}) {