diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-10-23 11:32:46 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-10-23 11:32:46 +0100 |
commit | 345e898e30f28ba054f7c417121498a1d6bcf0de (patch) | |
tree | 0f8535b473de19d4facf4cb22f37b48a6624bffa /dgit | |
parent | aa766846f53fe81ec2ffdd72db6919a11f8e9129 (diff) |
remote etc. - improve and fix some messages
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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"; } |