From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 23 Oct 2013 10:32:46 +0000 (+0100)
Subject: remote etc. - improve and fix some messages
X-Git-Tag: debian/0.17_experimental2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=345e898e30f28ba054f7c417121498a1d6bcf0de

remote etc. - improve and fix some messages
---

diff --git a/dgit b/dgit
index 81622398..0b177d36 100755
--- a/dgit
+++ b/dgit
@@ -120,7 +120,9 @@ our $debugprefix = '';
 
 sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
 
-sub fail { die "$us: @_\n"; }
+sub fail { 
+    die $us.($we_are_responder ? " (build host)" : "").": @_\n";
+}
 
 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
 
@@ -225,6 +227,7 @@ sub protocol_read_bytes ($$) {
 
 sub protocol_receive_file ($$) {
     my ($fh, $ourfn) = @_;
+    printdebug "() $ourfn\n";
     open PF, ">", $ourfn or die "$ourfn: $!";
     for (;;) {
 	my ($y,$l) = protocol_expect {
@@ -237,7 +240,6 @@ sub protocol_receive_file ($$) {
 	print PF $d or die $!;
     }
     close PF or die $!;
-    printdebug "() $ourfn\n";
 }
 
 #---------- remote protocol support, responder ----------
@@ -1129,7 +1131,7 @@ sub push_parse_dsc ($$$) {
     my $dversion = getfield $dsc, 'Version';
     my $dscpackage = getfield $dsc, 'Source';
     ($dscpackage eq $package && $dversion eq $cversion) or
-	fail "$dsc is for $dscpackage $dversion".
+	fail "$dscfn is for $dscpackage $dversion".
 	    " but debian/changelog is for $package $cversion";
 }