exit with non-zero exit status if setup() dies

This commit is contained in:
Johannes 'josch' Schauer 2018-09-21 19:06:47 +02:00
parent fcc40dc122
commit 7b2ca91f59
Signed by untrusted user: josch
GPG key ID: F2CBA5C78FBD83E1

View file

@ -1240,6 +1240,7 @@ sub main() {
} }
} }
my $exitstatus = 0;
my @taropts = ('--sort=name', "--mtime=\@$mtime", '--clamp-mtime', '--numeric-owner', '--one-file-system', '-c'); my @taropts = ('--sort=name', "--mtime=\@$mtime", '--clamp-mtime', '--numeric-owner', '--one-file-system', '-c');
push @taropts, @tar_compress_opts; push @taropts, @tar_compress_opts;
my $pid; my $pid;
@ -1316,6 +1317,9 @@ sub main() {
} }
close($rfh); close($rfh);
waitpid $pid, 0; waitpid $pid, 0;
if ($? != 0) {
$exitstatus = 1;
}
if ($options->{maketar} and -e $options->{root}) { if ($options->{maketar} and -e $options->{root}) {
if ($options->{mode} eq 'unshare') { if ($options->{mode} eq 'unshare') {
@ -1345,6 +1349,8 @@ sub main() {
0 == system('rm', '--recursive', '--preserve-root', '--one-file-system', $options->{root}) or die "rm failed: $!"; 0 == system('rm', '--recursive', '--preserve-root', '--one-file-system', $options->{root}) or die "rm failed: $!";
} }
} }
exit $exitstatus;
} }
main(); main();