X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=edb338ca455a3e9f50405a139518292a1f94931a;hb=0e6a55238ffdee98d5b23c70fe4105c41ea28f34;hp=37cbc51b68e52116705d1988cf040eef36919bda;hpb=d45a224aee98c04bf3038dcda9b258ba5abf0d70;p=dgit.git

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 37cbc51b..edb338ca 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -101,10 +101,10 @@ sub debugcmd {
     printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
 }
 
-sub debiantag ($) { 
-    my ($v) = @_;
+sub debiantag ($$) { 
+    my ($v,$distro) = @_;
     $v =~ y/~:/_%/;
-    return "debian/$v";
+    return "$distro/$v";
 }
 
 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;
-    $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;
 }