Convert to defvalopt: --clean

[dgit.git] / dgit

diff --git a/dgit b/dgit
index d4193ccd2e8d8df7da4d5c5460a57ea45176ca24..b06e0782aca0dbc1671f107b33e6568f6583018c 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3122,11 +3122,18 @@ sub defvalopt ($$$$) {
     # or $how can be a scalar ref, meaning simply assign the value
 }
 
-defvalopt '--since-version', '-v', '[^_]+|_', sub {
-    ($changes_since_version) = @_;
+defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
+defvalopt '--distro',        '-d', '.+',      \$idistro;
+defvalopt '--existing-package','', '.*',      \$existing_package;
+defvalopt '--build-products-dir','','.*',     \$buildproductsdir;
+defvalopt '--clean',       '', $cleanmode_re, \$cleanmode;
+
+defvalopt '--initiator-tempdir','','.*', sub {
+    ($initiator_tempdir) = (@_);
+    $initiator_tempdir =~ m#^/# or
+       badusage "--initiator-tempdir must be used specify an".
+       " absolute, not relative, directory."
 };
-defvalopt '--distro', '-d', '.+', sub { ($idistro) = (@_); };
-defvalopt '--existing-package', '', '.*', sub { ($existing_package) = (@_); };
 
 sub parseopts () {
     my $om;
@@ -3189,19 +3196,6 @@ sub parseopts () {
                     ($om = $opts_opt_map{$1})) {
                push @ropts, $_;
                push @$om, $2;
-           } 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/^--build-products-dir=(.*)/s) {
-               push @ropts, $_;
-               $buildproductsdir = $1;
-           } elsif (m/^--clean=($cleanmode_re)$/os) {
-               push @ropts, $_;
-               $cleanmode = $1;
-           } elsif (m/^--clean=(.*)$/s) {
-               badusage "unknown cleaning mode \`$1'";
            } elsif (m/^--quilt=($quilt_modes_re)$/s) {
                push @ropts, $_;
                $quilt_mode = $1;