Add SYSTEM_UPDATE option for atomic hosts#310
Merged
jprovaznik merged 3 commits intomasterfrom Dec 12, 2016
unknown repository
Merged
Add SYSTEM_UPDATE option for atomic hosts#310jprovaznik merged 3 commits intomasterfrom unknown repository
jprovaznik merged 3 commits intomasterfrom
unknown repository
Conversation
jprovaznik
reviewed
Dec 12, 2016
| then | ||
| # Update the OS tree | ||
| atomic host upgrade || notify_failure "failed to run 'atomic host upgrade'" | ||
| [ "$SYSTEM_UPDATE" = "True" ] && (atomic host upgrade || notify_failure "failed to run 'atomic host upgrade'") |
Contributor
There was a problem hiding this comment.
Good catch. One nit, because [ "$SYSTEM_UPDATE" = "True" ] is checked in both branches of "if-then-else", it would be better to move "[ "$SYSTEM_UPDATE" = "True" ]" in front of the if statement, something like:
[ "$SYSTEM_UPDATE" = "True" ] || exit 0
if [ -e /run/ostree-booted ]
then
# Update the OS tree
atomic host upgrade || notify_failure "failed to run 'atomic host upgrade'"
else
# Update using traditional RPMs
retry yum install -y deltarpm || notify_failure "could not install deltarpm"
retry yum -y update || notify_failure "could not update RPMs"
fi
Author
|
OK done :) |
Contributor
|
Cool, also a wrong indentation sneaked in in the "if" branch, could you fix it and squash commits to one? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If system_update is set to false, atomic is still being updated.