remote etc. - improve and fix some messages

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 4c3d224431e748ab04c183c1523800a2c201fc05..0b177d36fe3f518e4df791dc2dda3d5d0e8ae83f 100755 (executable)
--- 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,13 +1131,13 @@ 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";
 }
 
-sub push_mktag ($$$$$$$$) {
+sub push_mktag ($$$$$$$) {
     my ($head,$clogp,$tag,
-       $dsc,$dscfn,
+       $dscfn,
        $changesfile,$changesfilewhat,
        $tfn) = @_;
 
@@ -1269,7 +1271,7 @@ sub dopush () {
        $we_are_responder
        ? responder_receive_files('signed-tag', $tfn->('.signed.tmp'))
        : push_mktag($head,$clogp,$tag,
-                    $dsc,"../$dscfn",
+                    "../$dscfn",
                     $changesfile,$changesfile,
                                 $tfn);
 
@@ -1567,7 +1569,7 @@ sub i_want_signed_tag {
     push_parse_dsc $i_dscfn, 'remote dsc', 
 
     push_mktag $head, $i_clogp, $i_tag,
-        $dsc, $i_dscfn,
+        $i_dscfn,
         'remote.changes', 'remote changes',
         'tag.tag';