From c7bbe8b90ccd78ed753c7dba2dc3942528e7b478 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 May 2015 18:43:02 +0100
Subject: [PATCH] Move dgit's debugging arrangements into Dgit.pm

---
 Debian/Dgit.pm | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 dgit           | 36 ++++--------------------------------
 2 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 1ab65a8f..5c079a68 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -6,6 +6,7 @@ use strict;
 use warnings;
 
 use POSIX;
+use IO::Handle;
 
 BEGIN {
     use Exporter   ();
@@ -15,7 +16,9 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
-                      $package_re $component_re $branchprefix);
+                      $package_re $component_re $branchprefix
+                      initdebug enabledebug printdebug $debugprefix $debug
+                      shellquote printcmd);
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
     @EXPORT_OK   = @{ $EXPORT_TAGS{policyflags} };
 }
@@ -73,4 +76,45 @@ sub git_for_each_tag_referring ($$) {
     });
 }
 
+our $debugprefix;
+our $debug = 0;
+
+sub initdebug ($) { 
+    ($debugprefix) = @_;
+    open ::DEBUG, ">/dev/null" or die $!;
+}
+
+sub enabledebug () {
+    open ::DEBUG, ">&STDERR" or die $!;
+    ::DEBUG->autoflush(1);
+    $debug ||= 1;
+}
+    
+sub printdebug {
+    print ::DEBUG $debugprefix, @_ or die $!;
+}
+
+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 $!;
+}
+
 1;
diff --git a/dgit b/dgit
index 1f1c425d..268f3567 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;
-- 
2.30.2