upgrade: Add error message when staged deployment is incompatible #600
Conversation
This file contains 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
cgwalters
reviewed
Jun 13, 2024
lib/src/cli.rs
Outdated
| )); | ||
| } | ||
|
|
||
| if host.status.staged.is_some() |
There was a problem hiding this comment.
We should be able to drop this part; I know Rust combinators can be quite obscure but it's basically what the map_or(false) is doing here...if the option is None, then the result will be false.
There was a problem hiding this comment.
👍 thanks for the tip
lib/src/cli.rs
Outdated
Comment on lines
400
to
404
| && host | ||
| .status | ||
| .staged | ||
| .as_ref() | ||
| .map_or(false, |b| b.incompatible) |
There was a problem hiding this comment.
But for a bigger cleanup, I think we can merge the logic for checking something like this:
let booted_incompatible = host
.status
.booted
.as_ref()
.map_or(false, |b| b.incompatible);
let staged_incompatible = host
.status
.staged
.as_ref()
.map_or(false, |b| b.incompatible);
if booted_incompatible || staged_incompatible {
return Err...
}
or so?
There was a problem hiding this comment.
sounds good, updated
When running `rpm-ostree install <package>` without a reboot, `bootc upgrade` will fail. Prior to this, the error message was unclear of the cause. fixes RHEL-36003 Signed-off-by: Chris Kyrouac <ckyrouac@redhat.com>
ckyrouac
force-pushed
the
staged-upgrade-error
branch
from
b540238
to
ae5f6bc
Compare
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.
When running
rpm-ostree install <package>without a reboot,bootc upgradewill fail. Prior to this, the error message was unclear of the cause.fixes RHEL-36003