Convert to defvalopt: --existing-package

[dgit.git] / dgit

diff --git a/dgit b/dgit
index f068df6a50f267680368d2ffa5f72864c9644565..4f63f0324b56dea474fbd5beaab182feeb687b32 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3124,6 +3124,8 @@ sub defvalopt ($$$&) {
 defvalopt '--since-version', '-v', '[^_]+|_', sub {
     ($changes_since_version) = @_;
 };
+defvalopt '--distro', '-d', '.+', sub { ($idistro) = (@_); };
+defvalopt '--existing-package', '', '.*', sub { ($existing_package) = (@_); };
 
 sub parseopts () {
     my $om;
@@ -3181,17 +3183,11 @@ sub parseopts () {
                     ($om = $opts_opt_map{$1})) {
                push @ropts, $_;
                push @$om, $2;
-           } elsif (m/^--existing-package=(.*)/s) {
-               push @ropts, $_;
-               $existing_package = $1;
            } elsif (m/^--initiator-tempdir=(.*)/s) {
                $initiator_tempdir = $1;
                $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 +3243,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;