summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-02 19:28:54 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 11:54:09 +0100
commit5805198637ef23ec8d8303f4b3b1b7a0df188309 (patch)
treeb94bdd99fe374a3c99e6bedf7eddb5c994f6821b /dgit
parent0143e613578b90d0e320fe4bab748b7a8726fa13 (diff)
Rename $debug variable to $debuglevel (nfc)
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit14
1 files changed, 7 insertions, 7 deletions
diff --git a/dgit b/dgit
index e99df73..c1615e8 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,8 @@ sub cfg {
my @cmd = (@git, qw(config --), $c);
my $v;
{
- local ($Debian::Dgit::debug) = $debug-1;
- *debug = *Debian::Dgit::debug; # nnng
+ local ($Debian::Dgit::debuglevel) = $debuglevel-1;
+ *debug = *Debian::Dgit::debuglevel; # nnng
$v = cmdoutput_errok @cmd;
};
if ($?==0) {
@@ -1043,9 +1043,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 +1693,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;
@@ -2802,7 +2802,7 @@ sub parseopts () {
cmd_help();
} elsif (s/^-D/-/) {
push @ropts, $&;
- $debug++;
+ $debuglevel++;
enabledebug();
} elsif (s/^-N/-/) {
push @ropts, $&;