Dgit.pm: Introduce $deliberately_re and use it everywhere

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 009319a56996cc48a705d29251728d61b480dfbd..e80faf3ec8f7f56a90582950ad43565945b621b6 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -531,7 +531,7 @@ sub cfg {
        my @cmd = (@git, qw(config --), $c);
        my $v;
        {
-           local ($debuglevel) = $debuglevel-1;
+           local ($debuglevel) = $debuglevel-2;
            $v = cmdoutput_errok @cmd;
        };
        if ($?==0) {
@@ -2697,6 +2697,7 @@ sub cmd_archive_api_query {
     badusage "need only 1 subpath argument" unless @ARGV==1;
     my ($subpath) = @ARGV;
     my @cmd = archive_api_query_cmd($subpath);
+    debugcmd ">",@cmd;
     exec @cmd or fail "exec curl: $!\n";
 }
 
@@ -2783,7 +2784,7 @@ sub parseopts () {
            } elsif (m/^--no-rm-on-error$/s) {
                push @ropts, $_;
                $rmonerror = 0;
-           } elsif (m/^--deliberately-($suite_re)$/s) {
+           } elsif (m/^--deliberately-($deliberately_re)$/s) {
                push @ropts, $_;
                push @deliberatelies, $&;
            } else {