chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch to new production git repositories for reading. (this can no longer divert...
[dgit.git]
/
Debian
/
Dgit.pm
diff --git
a/Debian/Dgit.pm
b/Debian/Dgit.pm
index 37cbc51b68e52116705d1988cf040eef36919bda..edb338ca455a3e9f50405a139518292a1f94931a 100644
(file)
--- a/
Debian/Dgit.pm
+++ b/
Debian/Dgit.pm
@@
-101,10
+101,10
@@
sub debugcmd {
printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
}
printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
}
-sub debiantag ($) {
- my ($v) = @_;
+sub debiantag ($
$
) {
+ my ($v
,$distro
) = @_;
$v =~ y/~:/_%/;
$v =~ y/~:/_%/;
- return "
debian
/$v";
+ return "
$distro
/$v";
}
sub server_branch ($) { return "$branchprefix/$_[0]"; }
}
sub server_branch ($) { return "$branchprefix/$_[0]"; }
@@
-173,8
+173,13
@@
sub cmdoutput_errok {
die $! if P->error;
if (!close P) { printdebug "=>!$?\n"; return undef; }
chomp $d;
die $! if P->error;
if (!close P) { printdebug "=>!$?\n"; return undef; }
chomp $d;
- $d =~ m/^.*/;
- printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debuglevel>0; #';
+ if ($debuglevel > 0) {
+ $d =~ m/^.*/;
+ my $dd = $&;
+ my $more = (length $' ? '...' : ''); #');
+ $dd =~ s{[^\n -~]|\\}{ sprintf "\\x%02x", ord $& }ge;
+ printdebug "=> \`$dd'",$more,"\n";
+ }
return $d;
}
return $d;
}