summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Debian/Dgit.pm12
-rwxr-xr-xdgit3
2 files changed, 7 insertions, 8 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e09d12f..f166f11 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 c1615e8..009319a 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) {