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.pm: Introduce $printdebug_when_debuglevel
[dgit.git]
/
Debian
/
Dgit.pm
diff --git
a/Debian/Dgit.pm
b/Debian/Dgit.pm
index 787e50655487ec1e672a0c06aeb642f28e17a3b9..67db526d311cdb2d4462a88741e9440deb0aa87a 100644
(file)
--- a/
Debian/Dgit.pm
+++ b/
Debian/Dgit.pm
@@
-43,6
+43,7
@@
BEGIN {
dep14_version_mangle
debiantags debiantag_old debiantag_new
debiantag_maintview
dep14_version_mangle
debiantags debiantag_old debiantag_new
debiantag_maintview
+ upstreamversion
stripepoch source_file_leafname is_orig_file_of_p_v
server_branch server_ref
stat_exists link_ltarget
stripepoch source_file_leafname is_orig_file_of_p_v
server_branch server_ref
stat_exists link_ltarget
@@
-65,6
+66,7
@@
BEGIN {
$ffq_refprefix $gdrlast_refprefix
initdebug enabledebug enabledebuglevel
printdebug debugcmd
$ffq_refprefix $gdrlast_refprefix
initdebug enabledebug enabledebuglevel
printdebug debugcmd
+ $printdebug_when_debuglevel
$debugprefix *debuglevel *DEBUG
shellquote printcmd messagequote
$negate_harmful_gitattrs
$debugprefix *debuglevel *DEBUG
shellquote printcmd messagequote
$negate_harmful_gitattrs
@@
-99,6
+101,7
@@
our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
our $git_null_obj = '0' x 40;
our $ffq_refprefix = 'ffq-prev';
our $gdrlast_refprefix = 'debrebase-last';
our $git_null_obj = '0' x 40;
our $ffq_refprefix = 'ffq-prev';
our $gdrlast_refprefix = 'debrebase-last';
+our $printdebug_when_debuglevel = 1;
# policy hook exit status bits
# see dgit-repos-server head comment for documentation
# policy hook exit status bits
# see dgit-repos-server head comment for documentation
@@
-155,7
+158,8
@@
sub enabledebuglevel ($) {
}
sub printdebug {
}
sub printdebug {
- print DEBUG $debugprefix, @_ or die $! if $debuglevel>0;
+ print DEBUG $debugprefix, @_ or die $!
+ if $debuglevel >= $printdebug_when_debuglevel;
}
sub messagequote ($) {
}
sub messagequote ($) {
@@
-231,6
+235,12
@@
sub stripepoch ($) {
return $vsn;
}
return $vsn;
}
+sub upstreamversion ($) {
+ my ($vsn) = @_;
+ $vsn =~ s/-[^-]+$//;
+ return $vsn;
+}
+
sub source_file_leafname ($$$) {
my ($package,$vsn,$sfx) = @_;
return "${package}_".(stripepoch $vsn).$sfx
sub source_file_leafname ($$$) {
my ($package,$vsn,$sfx) = @_;
return "${package}_".(stripepoch $vsn).$sfx