From 89506141b188407123bf605d2b051f2dfa10ad4b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 May 2015 19:56:08 +0100
Subject: [PATCH] Debugging: use typeglobs to simplify various things (nfc)

---
 Debian/Dgit.pm | 12 ++++++------
 dgit           |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e09d12f6..f166f11b 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 $debuglevel
+                      $debugprefix *debuglevel *DEBUG
                       shellquote printcmd);
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
     @EXPORT_OK   = @{ $EXPORT_TAGS{policyflags} };
@@ -82,17 +82,17 @@ our $debuglevel = 0;
 
 sub initdebug ($) { 
     ($debugprefix) = @_;
-    open ::DEBUG, ">/dev/null" or die $!;
+    open DEBUG, ">/dev/null" or die $!;
 }
 
 sub enabledebug () {
-    open ::DEBUG, ">&STDERR" or die $!;
-    ::DEBUG->autoflush(1);
+    open DEBUG, ">&STDERR" or die $!;
+    DEBUG->autoflush(1);
     $debuglevel ||= 1;
 }
     
 sub printdebug {
-    print ::DEBUG $debugprefix, @_ or die $! if $debuglevel>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 $debuglevel>0;
+    printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
 }
 
 1;
diff --git a/dgit b/dgit
index c1615e8a..009319a5 100755
--- a/dgit
+++ b/dgit
@@ -531,8 +531,7 @@ sub cfg {
 	my @cmd = (@git, qw(config --), $c);
 	my $v;
 	{
-	    local ($Debian::Dgit::debuglevel) = $debuglevel-1;
-	    *debug = *Debian::Dgit::debuglevel; # nnng
+	    local ($debuglevel) = $debuglevel-1;
 	    $v = cmdoutput_errok @cmd;
 	};
 	if ($?==0) {
-- 
2.30.2