origin: Switch baserefspec → refspec when de-layering #2882
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
3f3348f to
36ec429
Compare
5808f57 to
710a88e
Compare
|
OK lifting draft on this one, I think it's good to go. It's been more extensiveliy tested in #2743 and I think the last failure there is unrelated. |
jlebon
reviewed
Jun 11, 2021
The idea originally was that we'd switch to `baserefspec` when performing changes such that `ostree admin upgrade` would no longer work. But that has long since been buggy since the introduction of things like `rpm-ostree initramfs --enable` etc. The only goal of this PR is to avoid "leaking state" across origin switches, so that the work to map origin ⇔ treefile can also (correctly) be stateless.
710a88e to
efd668a
Compare
jlebon
approved these changes
Jun 14, 2021
| @@ -714,6 +722,7 @@ rpmostree_origin_remove_packages (RpmOstreeOrigin *origin, | |||
| update_keyfile_pkgs_from_cache (origin, "packages", "requested-local", | |||
| origin->cached_local_packages, TRUE); | |||
|
|
|||
| sync_baserefspec (origin); | |||
There was a problem hiding this comment.
Isn't this redundant with the calls we do in update_keyfile_pkgs_from_cache?
There was a problem hiding this comment.
Yeah it is. Doesn't seem worth rerunning all the CI just for that, I'll fix it in #2743
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.
The idea originally was that we'd switch to
baserefspecwhenperforming changes such that
ostree admin upgradewould no longerwork. But that has long since been buggy since the introduction
of things like
rpm-ostree initramfs --enableetc.The only goal of this PR is to avoid "leaking state" across
origin switches, so that the work to map origin ⇔ treefile
can also (correctly) be stateless.