X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=e80faf3ec8f7f56a90582950ad43565945b621b6;hp=e99df73b161280fc5396431fcc4d63592f8c754f;hb=7684f83e49bdc4d883e682abd922a7722cf996c4;hpb=0143e613578b90d0e320fe4bab748b7a8726fa13

diff --git a/dgit b/dgit
index e99df73b..e80faf3e 100755
--- a/dgit
+++ b/dgit
@@ -413,7 +413,7 @@ sub cmdoutput_errok {
     if (!close P) { printdebug "=>!$?\n"; return undef; }
     chomp $d;
     $d =~ m/^.*/;
-    printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
+    printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debuglevel>0; #';
     return $d;
 }
 
@@ -531,8 +531,7 @@ sub cfg {
 	my @cmd = (@git, qw(config --), $c);
 	my $v;
 	{
-	    local ($Debian::Dgit::debug) = $debug-1;
-	    *debug = *Debian::Dgit::debug; # nnng
+	    local ($debuglevel) = $debuglevel-2;
 	    $v = cmdoutput_errok @cmd;
 	};
 	if ($?==0) {
@@ -1043,9 +1042,9 @@ sub get_archive_dsc () {
 		    " archive told us to expect $digest";
 	}
 	my $dscfh = new IO::File \$dscdata, '<' or die $!;
-	printdebug Dumper($dscdata) if $debug>1;
+	printdebug Dumper($dscdata) if $debuglevel>1;
 	$dsc = parsecontrolfh($dscfh,$dscurl,1);
-	printdebug Dumper($dsc) if $debug>1;
+	printdebug Dumper($dsc) if $debuglevel>1;
 	my $fmt = getfield $dsc, 'Format';
 	fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
 	$dsc_checked = !!$digester;
@@ -1693,7 +1692,7 @@ sub dopush () {
         $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
     my ($tree,$dir) = mktree_in_ud_from_only_subdir();
     changedir '../../../..';
-    my $diffopt = $debug>0 ? '--exit-code' : '--quiet';
+    my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
     my @diffcmd = (@git, qw(diff), $diffopt, $tree);
     debugcmd "+",@diffcmd;
     $!=0; $?=0;
@@ -2698,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";
 }
 
@@ -2784,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 {
@@ -2802,7 +2802,7 @@ sub parseopts () {
 		    cmd_help();
 		} elsif (s/^-D/-/) {
 		    push @ropts, $&;
-		    $debug++;
+		    $debuglevel++;
 		    enabledebug();
 		} elsif (s/^-N/-/) {
 		    push @ropts, $&;