chiark / gitweb /
Subcommand program or argument options containing hyphens work. (Eg, --dpkg-buildpack...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 17 Nov 2013 18:16:21 +0000 (18:16 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 24 Nov 2013 17:01:51 +0000 (17:01 +0000)
debian/changelog
dgit

index 7611fca..6d6c305 100644 (file)
@@ -2,6 +2,8 @@ dgit (0.18.1) unstable; urgency=low
 
   Bugfixes:
   * sshpsql archive query method passes LANG=C.  Closes:#729788.
+  * Subcommand program or argument options containing hyphens work.
+    (Eg, --dpkg-buildpackage:blah was previously incorrectly rejected.)
 
   Packaging fixes:
   * Depend on dput.
diff --git a/dgit b/dgit
index 088f5d2..0f372f2 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1896,12 +1896,12 @@ sub parseopts () {
            } elsif (m/^--since-version=([^_]+|_)$/) {
                push @ropts, $_;
                $changes_since_version = $1;
-           } elsif (m/^--(\w+)=(.*)/s &&
+           } elsif (m/^--([-0-9a-z]+)=(.*)/s &&
                     ($om = $opts_opt_map{$1}) &&
                     length $om->[0]) {
                push @ropts, $_;
                $om->[0] = $2;
-           } elsif (m/^--(\w+):(.*)/s &&
+           } elsif (m/^--([-0-9a-z]+):(.*)/s &&
                     !$opts_opt_cmdonly{$1} &&
                     ($om = $opts_opt_map{$1})) {
                push @ropts, $_;