r2033: * Add --ignore option. This is intended to ease dealing with upstream

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

diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index c698b7c5ab67747892f3c6e72f6174e50463c581..d1e052affba85501c5ca5fc72189f76f432c05b4 100644 (file)
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -63,6 +63,11 @@ sub AddExclude { my($option,$value)=@_;
        push @{$options{EXCLUDE}},$value;
 }
 
+# Add a file to the ignore list.
+sub AddIgnore { my($option,$file)=@_;
+       $options{IGNORE}->{$file}=1;
+}
+
 # This collects non-options values.
 sub NonOption {
        push @{$options{ARGV}}, @_;
@@ -103,6 +108,8 @@ sub parseopts {
        
                "X=s" => \&AddExclude,
                "exclude=s" => \&AddExclude,
+               
+               "ignore=s" => \&AddIgnore,
        
                "d" => \$options{D_FLAG},
                "remove-d" => \$options{D_FLAG},
@@ -144,7 +151,7 @@ sub parseopts {
 
                "filename=s" => \$options{FILENAME},
                
-               "priority=i" => \$options{PRIORITY},
+               "priority=s" => \$options{PRIORITY},
                
                "flavor=s" => \$options{FLAVOR},
 
@@ -165,6 +172,10 @@ sub parseopts {
                "keep-debug" => \$options{KEEP_DEBUG},
                
                "error-handler=s" => \$options{ERROR_HANDLER},
+               
+               "add-udeb=s" => \$options{SHLIBS_UDEB},
+               
+               "language=s" => \$options{LANGUAGE},
 
                "<>" => \&NonOption,
        );
@@ -186,7 +197,8 @@ sub parseopts {
                if ($options{DOINDEP} || $options{DOARCH} || $options{DOSAME}) {
                        # User specified that all arch (in)dep package be
                        # built, and there are none of that type.
-                       error("I have no package to build");
+                       warning("I have no package to build");
+                       exit(0);
                }
                push @{$options{DOPACKAGES}},getpackages();
        }