Move dgit's debugging arrangements into Dgit.pm

1 files changed, 4 insertions, 32 deletions

diff --git a/dgit b/dgit
index 1f1c425..268f356 100755
--- a/dgit
+++ b/dgit
@@ -99,9 +99,6 @@ our %opts_opt_cmdonly = ('gpg' => 1);
 
 our $keyid;
 
-our $debug = 0;
-open DEBUG, ">/dev/null" or die $!;
-
 autoflush STDOUT 1;
 
 our $remotename = 'dgit';
@@ -132,7 +129,7 @@ sub dscfn ($) {
 }
 
 our $us = 'dgit';
-our $debugprefix = '';
+initdebug('');
 
 our @end;
 END { 
@@ -160,8 +157,6 @@ sub waitstatusmsg () {
     }
 }
 
-sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
-
 sub fail { 
     my $s = "@_\n";
     my $prefix = $us.($we_are_responder ? " (build host)" : "").": ";
@@ -379,29 +374,6 @@ sub url_get {
 
 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
 
-sub shellquote {
-    my @out;
-    local $_;
-    foreach my $a (@_) {
-	$_ = $a;
-	if (m{[^-=_./0-9a-z]}i) {
-	    s{['\\]}{'\\$&'}g;
-	    push @out, "'$_'";
-	} else {
-	    push @out, $_;
-	}
-    }
-    return join ' ', @out;
-}
-
-sub printcmd {
-    my $fh = shift @_;
-    my $intro = shift @_;
-    print $fh $intro," " or die $!;
-    print $fh shellquote @_ or die $!;
-    print $fh "\n" or die $!;
-}
-
 sub failedcmd {
     { local ($!); printcmd \*STDERR, "$us: failed command:", @_ or die $!; };
     if ($!) {
@@ -559,7 +531,8 @@ sub cfg {
 	my @cmd = (@git, qw(config --), $c);
 	my $v;
 	{
-	    local ($debug) = $debug-1;
+	    local ($Debian::Dgit::debug) = $debug-1;
+	    *debug = *Debian::Dgit::debug; # nnng
 	    $v = cmdoutput_errok @cmd;
 	};
 	if ($?==0) {
@@ -2829,9 +2802,8 @@ sub parseopts () {
 		    cmd_help();
 		} elsif (s/^-D/-/) {
 		    push @ropts, $&;
-		    open DEBUG, ">&STDERR" or die $!;
-		    autoflush DEBUG 1;
 		    $debug++;
+		    enabledebug();
 		} elsif (s/^-N/-/) {
 		    push @ropts, $&;
 		    $new_package=1;