josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

don't die if output cannot be written to tarball and instead check error condition early

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2018-12-28 05:09:08 +01:00
parent f4263ebd74
commit 3f29fa461a
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mmdebstrap
View file

@ -1683,6 +1683,11 @@ sub main() {
if (any { $_ eq $options->{variant} } ('extract', 'custom') and $options->{mode} eq 'fakechroot') { if (any { $_ eq $options->{variant} } ('extract', 'custom') and $options->{mode} eq 'fakechroot') {
print STDERR "I: creating a tarball in fakechroot mode might fail in extract and custom variants because there might be no tar inside the chroot\n"; print STDERR "I: creating a tarball in fakechroot mode might fail in extract and custom variants because there might be no tar inside the chroot\n";
} }
# try to fail early if target tarball cannot be opened for writing
if ($options->{target} ne '-') {
open my $fh, '>', $options->{target} or die "cannot open $options->{target} for writing: $!";
close $fh;
}
} }
if ($options->{maketar}) { if ($options->{maketar}) {
@ -1890,11 +1895,20 @@ sub main() {
} }
close $wfh; close $wfh;
if ($options->{maketar}) { if ($options->{maketar}) {
# we cannot die here because that would leave the other thread running
# without a parent
if ($options->{target} ne '-') { if ($options->{target} ne '-') {
copy($rfh, $options->{target}) or die "cannot copy to $options->{target}: $!"; if(!copy($rfh, $options->{target})) {
print STDERR "E: cannot copy to $options->{target}: $!\n";
$exitstatus = 1;
}
} else { } else {
copy($rfh, *STDOUT) or die "cannot copy to standard output: $!"; if (!copy($rfh, *STDOUT)) {
print STDERR "E: cannot copy to standard output: $!\n";
$exitstatus = 1;
}
} }
} }
close($rfh); close($rfh);