Reject (rather than ignoring) further options merged witht -wn, -wg, -wd.

[dgit.git] / dgit

diff --git a/dgit b/dgit
index f6324e02a59a3a8cc6b363b455c4ca3f413ca32a..7cbef4e75fb218d2e55a69fa3e1e8ff76c535c3e 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1413,6 +1413,7 @@ sub clone ($) {
     }
     fetch_from_archive() or no_such_package;
     my $vcsgiturl = $dsc->{'Vcs-Git'};
     }
     fetch_from_archive() or no_such_package;
     my $vcsgiturl = $dsc->{'Vcs-Git'};

+    $vcsgiturl =~ s/\s+-b\s+\S+//g;

     if (length $vcsgiturl) {
        runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }
     if (length $vcsgiturl) {
        runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }


@@ -2717,24 +2718,27 @@ sub parseopts () {
                } elsif (s/^-c(.*=.*)//s) {
                    push @ropts, $&;
                    push @git, '-c', $1;
                } elsif (s/^-c(.*=.*)//s) {
                    push @ropts, $&;
                    push @git, '-c', $1;

-               } elsif (s/^-d(.*)//s) {
+               } elsif (s/^-d(.+)//s) {

                    push @ropts, $&;
                    $idistro = $1;
                    push @ropts, $&;
                    $idistro = $1;

-               } elsif (s/^-C(.*)//s) {
+               } elsif (s/^-C(.+)//s) {

                    push @ropts, $&;
                    $changesfile = $1;
                    if ($changesfile =~ s#^(.*)/##) {
                        $buildproductsdir = $1;
                    }
                    push @ropts, $&;
                    $changesfile = $1;
                    if ($changesfile =~ s#^(.*)/##) {
                        $buildproductsdir = $1;
                    }

-               } elsif (s/^-k(.*)//s) {
+               } elsif (s/^-k(.+)//s) {

                    $keyid=$1;
                    $keyid=$1;

-               } elsif (s/^-wn//s) {
+               } elsif (m/^-[vdCk]$/) {
+                   badusage
+ "option \`$_' requires an argument (and no space before the argument)";
+               } elsif (s/^-wn$//s) {

                    push @ropts, $&;
                    $cleanmode = 'none';
                    push @ropts, $&;
                    $cleanmode = 'none';

-               } elsif (s/^-wg//s) {
+               } elsif (s/^-wg$//s) {

                    push @ropts, $&;
                    $cleanmode = 'git';
                    push @ropts, $&;
                    $cleanmode = 'git';

-               } elsif (s/^-wd//s) {
+               } elsif (s/^-wd$//s) {

                    push @ropts, $&;
                    $cleanmode = 'dpkg-source';
                } else {
                    push @ropts, $&;
                    $cleanmode = 'dpkg-source';
                } else {