chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-repos-policy-debian: WIP bugfixes to debugging
[dgit.git]
/
Debian
/
Dgit.pm
diff --git
a/Debian/Dgit.pm
b/Debian/Dgit.pm
index 5c079a68d3abfa8e4ce89b969027337244d4c53b..f68ebd228366676e97e4921bcffd6446bf6345c9 100644
(file)
--- a/
Debian/Dgit.pm
+++ b/
Debian/Dgit.pm
@@
-17,7
+17,9
@@
BEGIN {
@EXPORT = qw(debiantag server_branch server_ref
stat_exists git_for_each_ref
$package_re $component_re $branchprefix
@EXPORT = qw(debiantag server_branch server_ref
stat_exists git_for_each_ref
$package_re $component_re $branchprefix
- initdebug enabledebug printdebug $debugprefix $debug
+ initdebug enabledebug enabledebuglevel
+ printdebug debugcmd
+ $debugprefix *debuglevel *DEBUG
shellquote printcmd);
%EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
@EXPORT_OK = @{ $EXPORT_TAGS{policyflags} };
shellquote printcmd);
%EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
@EXPORT_OK = @{ $EXPORT_TAGS{policyflags} };
@@
-77,21
+79,27
@@
sub git_for_each_tag_referring ($$) {
}
our $debugprefix;
}
our $debugprefix;
-our $debug = 0;
+our $debug
level
= 0;
sub initdebug ($) {
($debugprefix) = @_;
sub initdebug ($) {
($debugprefix) = @_;
- open
::
DEBUG, ">/dev/null" or die $!;
+ open DEBUG, ">/dev/null" or die $!;
}
sub enabledebug () {
}
sub enabledebug () {
- open ::DEBUG, ">&STDERR" or die $!;
- ::DEBUG->autoflush(1);
- $debug ||= 1;
+ open DEBUG, ">&STDERR" or die $!;
+ DEBUG->autoflush(1);
+ $debuglevel ||= 1;
+}
+
+sub enabledebuglevel ($) {
+ die if $debuglevel;
+ $debuglevel = $_[0] + 0;
+ enabledebug();
}
sub printdebug {
}
sub printdebug {
- print
::DEBUG $debugprefix, @_ or die $!
;
+ print
DEBUG $debugprefix, @_ or die $! if $debuglevel>0
;
}
sub shellquote {
}
sub shellquote {
@@
-99,7
+107,7
@@
sub shellquote {
local $_;
foreach my $a (@_) {
$_ = $a;
local $_;
foreach my $a (@_) {
$_ = $a;
- if (m{[^-=_./0-9a-z]}i) {
+ if (
!length ||
m{[^-=_./0-9a-z]}i) {
s{['\\]}{'\\$&'}g;
push @out, "'$_'";
} else {
s{['\\]}{'\\$&'}g;
push @out, "'$_'";
} else {
@@
-117,4
+125,9
@@
sub printcmd {
print $fh "\n" or die $!;
}
print $fh "\n" or die $!;
}
+sub debugcmd {
+ my $extraprefix = shift @_;
+ printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
+}
+
1;
1;