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

Do not die if reading the number of ext2 blocks failed as that would skip the cleanup action

Browse source 
Reported-by: Helmut Grohne <helmut@subdivi.de>
This commit is contained in:
Johannes Schauer Marin Rodrigues 2023-02-23 21:50:55 +01:00
parent 8bdd04fce1
commit e7f21ce04c
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mmdebstrap
View file

@ -6028,12 +6028,16 @@ sub main() {
close $nblkwriter; close $nblkwriter;
if (!$options->{dryrun} && $format eq 'ext2') { if (!$options->{dryrun} && $format eq 'ext2') {
$numblocks = <$nblkreader>; $numblocks = <$nblkreader>;
if (!defined $numblocks) { if (defined $numblocks) {
chomp $numblocks;
} else {
# This can happen if the setup process died early and thus closes # This can happen if the setup process died early and thus closes
# the pipe from the other and. The EOF is turned into undef. # the pipe from the other and. The EOF is turned into undef.
error "failed to read required number of blocks"; # we cannot die here because that would skip the cleanup task
warning "failed to read required number of blocks";
$exitstatus = 1;
$numblocks = -1;
} }
chomp $numblocks;
} }
close $nblkreader; close $nblkreader;