Debugging: use typeglobs to simplify various things (nfc)

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e09d12f6411978f75eeb2c81d5d7d70508e0baef..f166f11b58464b7d9616579fb3af89f4ef01a41d 100644 (file)
--- 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 c1615e8a44f6a2c7b91d3b5a945bddd0c573d900..009319a56996cc48a705d29251728d61b480dfbd 100755 (executable)
--- 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) {