From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 14 Aug 2015 13:07:21 +0000 (+0100)
Subject: Convert to defvalopt: --distro, -d
X-Git-Tag: debian/1.2~15
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=bf5e40c8a56c5d7c3f78b50d354bd6568190375a;hp=f83789bb6d8cda46a87a61ca846843376261ad35

Convert to defvalopt: --distro, -d
---

diff --git a/dgit b/dgit
index f068df6a..89633444 100755
--- a/dgit
+++ b/dgit
@@ -3124,6 +3124,7 @@ sub defvalopt ($$$&) {
 defvalopt '--since-version', '-v', '[^_]+|_', sub {
     ($changes_since_version) = @_;
 };
+defvalopt '--distro', '-d', '.+', sub { ($idistro) = (@_); };
 
 sub parseopts () {
     my $om;
@@ -3189,9 +3190,6 @@ sub parseopts () {
 		$initiator_tempdir =~ m#^/# or
 		    badusage "--initiator-tempdir must be used specify an".
 		        " absolute, not relative, directory."
-	    } elsif (m/^--distro=(.*)/s) {
-		push @ropts, $_;
-		$idistro = $1;
 	    } elsif (m/^--build-products-dir=(.*)/s) {
 		push @ropts, $_;
 		$buildproductsdir = $1;
@@ -3247,9 +3245,6 @@ sub parseopts () {
 		} elsif (s/^-c(.*=.*)//s) {
 		    push @ropts, $&;
 		    push @git, '-c', $1;
-		} elsif (s/^-d(.+)//s) {
-		    push @ropts, $&;
-		    $idistro = $1;
 		} elsif (s/^-C(.+)//s) {
 		    push @ropts, $&;
 		    $changesfile = $1;