Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Handle error during decompression #1665

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Handle error during decompression #1665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions support/modules/directory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,25 @@ case "$STATE" in
test "$dest_dir" = "/" && \
echo "Error: destination dir is '/', install not supported." && exit 1
mkdir -p $dest_dir
if ! tar -cf ${prev_files_tar} -C ${dest_dir} .

tar -cf ${prev_files_tar} -C ${dest_dir} .
createPrevSuccess=$?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this won't work as intended because set -e is active. It will simply stop at the tar command once there is an error, because it's not part of a conditional, and won't continue to the next line.

I can't really see the problem with the previous code though, it looks correct to me. ret is being set, and is returned, as it should. The only thing missing is a more descriptive message. Are you saying this didn't work correctly for you?

if [ $createPrevSuccess -ne 0 ]
then
ret=$?
echo "Fatal error: Unable to create backup"
# Make sure there is no half-backup lying around.
rm -f ${prev_files_tar}
exit $ret
exit $createPrevSuccess
fi
rm -rf ${dest_dir}
mkdir -p ${dest_dir}
tar -xf ${update_files_tar} -C ${dest_dir}
extractSuccess=$?
if [ $extractSuccess -ne 0 ]
then
echo "Fatal error: something went wrong during artifact installation"
exit $extractSuccess
Comment on lines 41 to +46
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here too: This code will never be reached because of set -e.

fi
;;

ArtifactRollback)
Expand Down