From 5805198637ef23ec8d8303f4b3b1b7a0df188309 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 May 2015 19:28:54 +0100
Subject: Rename $debug variable to $debuglevel (nfc)

---
 Debian/Dgit.pm | 10 +++++-----
 dgit           | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 641a917..e09d12f 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -18,7 +18,7 @@ BEGIN {
                       stat_exists git_for_each_ref
                       $package_re $component_re $branchprefix
                       initdebug enabledebug printdebug debugcmd
-                      $debugprefix $debug
+                      $debugprefix $debuglevel
                       shellquote printcmd);
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
     @EXPORT_OK   = @{ $EXPORT_TAGS{policyflags} };
@@ -78,7 +78,7 @@ sub git_for_each_tag_referring ($$) {
 }
 
 our $debugprefix;
-our $debug = 0;
+our $debuglevel = 0;
 
 sub initdebug ($) { 
     ($debugprefix) = @_;
@@ -88,11 +88,11 @@ sub initdebug ($) {
 sub enabledebug () {
     open ::DEBUG, ">&STDERR" or die $!;
     ::DEBUG->autoflush(1);
-    $debug ||= 1;
+    $debuglevel ||= 1;
 }
     
 sub printdebug {
-    print ::DEBUG $debugprefix, @_ or die $! if $debug>0;
+    print ::DEBUG $debugprefix, @_ or die $! if $debuglevel>0;
 }
 
 sub shellquote {
@@ -120,7 +120,7 @@ sub printcmd {
 
 sub debugcmd {
     my $extraprefix = shift @_;
-    printcmd(\*::DEBUG,$debugprefix.$extraprefix,@_) if $debug>0;
+    printcmd(\*::DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
 }
 
 1;
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, $&;
-- 
cgit v1.2.3