Uniformize @argv parsing in source package formats

* scripts/Dpkg/Source/Package/V2_0.pm: Improve error
message when we have too many arguments.
* scripts/Dpkg/Source/Package/V3_0/bzr.pm: Same here.
* scripts/Dpkg/Source/Package/V3_0/git.pm: Same here.
* scripts/Dpkg/Source/Package/V3_0/native.pm: Add check
of number of arguments.
* scripts/Dpkg/Source/Package/V1_0.pm: Make sure we're
not going to fail when we delegate to do_build() of
V3_0/native.pm.

diff --git a/scripts/Dpkg/Source/Package/V1_0.pm b/scripts/Dpkg/Source/Package/V1_0.pm
index 3a4706cbbef01252ddb2bc80390a4fdce060e683..a3e696070f3fdbecc6484f0746e5054323e10e3e 100644 (file)
--- a/scripts/Dpkg/Source/Package/V1_0.pm
+++ b/scripts/Dpkg/Source/Package/V1_0.pm
@@ -268,6 +268,7 @@ sub do_build {
     }
 
     if ($sourcestyle eq "n") {
+        $self->{'options'}{'ARGV'} = []; # ensure we have no error
         Dpkg::Source::Package::V3_0::native::do_build($self, $dir);
     } elsif ($sourcestyle =~ m/[nurUR]/) {
         if (stat($tarname)) {

diff --git a/scripts/Dpkg/Source/Package/V2_0.pm b/scripts/Dpkg/Source/Package/V2_0.pm
index 8a3d1e3ffae54a9ed1ecdf4a54b5fd7115985590..0d6ac112b39d35ece93cea1ba97fe34261646887 100644 (file)
--- a/scripts/Dpkg/Source/Package/V2_0.pm
+++ b/scripts/Dpkg/Source/Package/V2_0.pm
@@ -178,7 +178,8 @@ sub do_build {
 
     my ($dirname, $updir) = fileparse($dir);
     if (scalar(@argv)) {
-        usageerr(_g("-b takes only one parameter with v2.0 source packages"));
+        usageerr(_g("-b takes only one parameter with format `%s'"),
+                 $self->{'fields'}{'Format'});
     }
     $self->prepare_build($dir);
 

diff --git a/scripts/Dpkg/Source/Package/V3_0/bzr.pm b/scripts/Dpkg/Source/Package/V3_0/bzr.pm
index a0e1974d3f657ae7d744246557fd27a54a134b0a..3e6bf1fe45bd4efa3c6e1366e8509160bc2093cb 100644 (file)
--- a/scripts/Dpkg/Source/Package/V3_0/bzr.pm
+++ b/scripts/Dpkg/Source/Package/V3_0/bzr.pm
@@ -92,7 +92,8 @@ sub do_build {
        my ($dirname, $updir) = fileparse($dir);
 
        if (scalar(@argv)) {
-               usageerr(_g("-b takes only one parameter with v3.0 source packages"));
+            usageerr(_g("-b takes only one parameter with format `%s'"),
+                     $self->{'fields'}{'Format'});
        }
 
        my $sourcepackage = $self->{'fields'}{'Source'};

diff --git a/scripts/Dpkg/Source/Package/V3_0/git.pm b/scripts/Dpkg/Source/Package/V3_0/git.pm
index 1b4bef86a2455c2f464e199592340c83328ee9aa..4839dcc38162a154b070e1ce2138d8e3a2d67c07 100644 (file)
--- a/scripts/Dpkg/Source/Package/V3_0/git.pm
+++ b/scripts/Dpkg/Source/Package/V3_0/git.pm
@@ -120,7 +120,8 @@ sub do_build {
     my ($dirname, $updir) = fileparse($dir);
 
     if (scalar(@argv)) {
-       usageerr(_g("-b takes only one parameter with v3.0 source packages"));
+        usageerr(_g("-b takes only one parameter with format `%s'"),
+                 $self->{'fields'}{'Format'});
     }
 
     my $sourcepackage = $self->{'fields'}{'Source'};

diff --git a/scripts/Dpkg/Source/Package/V3_0/native.pm b/scripts/Dpkg/Source/Package/V3_0/native.pm
index bbc03ed0bdb4d02ef4b3d398b240a71d1d37df81..5efab3ef993f817fc16b648c2a2bf15f738f5126 100644 (file)
--- a/scripts/Dpkg/Source/Package/V3_0/native.pm
+++ b/scripts/Dpkg/Source/Package/V3_0/native.pm
@@ -66,6 +66,12 @@ sub can_build {
 sub do_build {
     my ($self, $dir) = @_;
     my @tar_ignore = map { "--exclude=$_" } @{$self->{'options'}{'tar_ignore'}};
+    my @argv = $self->{'options'}{'ARGV'};
+
+    if (scalar(@argv)) {
+        usageerr(_g("-b takes only one parameter with format `%s'"),
+                 $self->{'fields'}{'Format'});
+    }
 
     my $sourcepackage = $self->{'fields'}{'Source'};
     my $basenamerev = $self->get_basename(1);