our $existing_package = 'dpkg';
our $cleanmode = 'dpkg-source';
our $we_are_responder;
+our $initiator_tempdir;
our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
sub changesopts () { return @changesopts[1..$#changesopts]; }
our $us = 'dgit';
-our $debugprefix = ' ';
+our $debugprefix = '';
sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
my $d;
my $got = read PF, $d, 65536;
die "$ourfn: $!" unless defined $got;
- last if $got;
+ last if !$got;
print $fh "data-block ".length($d)."\n" or die $!;
print $d or die $!;
}
+ PF->eof or die "$ourfn $!";
+ PF->error and die "$ourfn $!";
print $fh "data-end\n" or die $!;
close PF;
}
sub protocol_read_bytes ($$) {
my ($fh, $nbytes) = @_;
- $nbytes =~ m/^\d{1,6}$/ or badproto \*RO, "bad byte count";
+ $nbytes =~ m/^[1-9]\d{0,5}$/ or badproto \*RO, "bad byte count";
my $d;
my $got = read $fh, $d, $nbytes;
$got==$nbytes or badproto $fh, "eof during data block";
open PF, ">", $ourfn or die "$ourfn: $!";
for (;;) {
my ($y,$l) = protocol_expect {
- m/^data-block (.*})$|data-end$/;
- length $1 ? (1,$1) : (0);
+ m/^data-block (.*)$/ ? (1,$1) :
+ m/^data-end$/ ? (0,) :
+ ();
} $fh;
last unless $y;
- my $d = protocol_read_bytes $fh, $1;
+ my $d = protocol_read_bytes $fh, $l;
print PF $d or die $!;
}
- printdebug "received into $ourfn\n";
+ close PF or die $!;
+ printdebug "() $ourfn\n";
}
#---------- remote protocol support, responder ----------
my ($clogpfn) = @_;
my $clogp = Dpkg::Control::Hash->new();
- $clogp->load($clogpfn);
+ $clogp->load($clogpfn) or die;
$package = getfield $clogp, 'Source';
my $cversion = getfield $clogp, 'Version';
@ARGV = @ARGV[$nrargs..$#ARGV];
die unless @rargs;
my ($dir) = @rargs;
+ $debugprefix = ' ';
changedir $dir;
$we_are_responder = 1;
- $debugprefix = ' ';
autoflush STDOUT 1;
responder_send_command("dgit-remote-push-ready");
&cmd_push;
sub i_cleanup {
local ($@);
return unless defined $i_tmp;
+ return if defined $initiator_tempdir;
changedir "/";
eval { rmtree $i_tmp; };
}
my @cmd = (@ssh, $host, shellquote @rdgit);
printcmd \*DEBUG,$debugprefix."+",@cmd;
eval {
- $i_tmp = tempdir();
+ if (defined $initiator_tempdir) {
+ rmtree $initiator_tempdir;
+ mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
+ $i_tmp = $initiator_tempdir;
+ } else {
+ $i_tmp = tempdir();
+ }
my $pid = open2(\*RO, \*RI, @cmd);
changedir $i_tmp;
initiator_expect { m/^dgit-remote-push-ready/ };
sub i_localname_changes { return "remote.changes"; }
sub i_localname_dsc {
($i_clogp, $i_version, $i_tag, $i_dscfn) =
- push_parse_changelog 'remote-changelog.822';
+ push_parse_changelog "$i_tmp/remote-changelog.822";
die if $i_dscfn =~ m#/|^\W#;
return $i_dscfn;
}
} elsif (m/^--existing-package=(.*)/s) {
push @ropts, $_;
$existing_package = $1;
+ } elsif (m/^--initiator-tempdir=(.*)/s) {
+ $initiator_tempdir = $1;
+ $initiator_tempdir =~ m#^/# or
+ badusage "--initiator-tempdir must be used specify an".
+ " absolute, not relative, directory."
} elsif (m/^--distro=(.*)/s) {
push @ropts, $_;
$idistro = $1;