Closed
Conversation
|
☔ The latest upstream changes (presumably 9c02342) made this pull request unmergeable. Please resolve the merge conflicts. |
cgwalters
force-pushed
the
live-updates-prep
branch
from
05b1597 to
d862881
Compare
cgwalters
force-pushed
the
live-updates-prep
branch
from
d862881 to
dba2940
Compare
Member
Author
|
bot, test this please |
cgwalters
force-pushed
the
live-updates-prep
branch
from
dba2940 to
f7932de
Compare
Member
|
test comment |
Member
|
bot, retest this please |
Member
|
test comment |
Closed
cgwalters
force-pushed
the
live-updates-prep
branch
from
f7932de to
ff88c96
Compare
jlebon
reviewed
Apr 24, 2017
src/daemon/rpmostree-sysroot-core.c
Outdated
| rpmostree_syscore_get_origin_merge_deployment (OstreeSysroot *self, const char *osname) | ||
| { | ||
| g_autoptr(GPtrArray) deployments = ostree_sysroot_get_deployments (self); | ||
| guint i; |
Member
There was a problem hiding this comment.
Nit: this could be declared in the for loop initializer.
src/daemon/rpmostree-sysroot-core.c
Outdated
| const gboolean is_booted = ostree_deployment_equal (deployment, booted_deployment); | ||
| const gboolean is_merge_or_booted = is_booted || | ||
| ostree_deployment_equal (deployment, merge_deployment); | ||
| const gboolean is_last = i == (deployments->len - 1); |
Member
There was a problem hiding this comment.
Nit: can we wrap this 🌯 in parentheses?
| @@ -385,6 +385,59 @@ rpmostree_syscore_add_deployment (OstreeSysroot *sysroot, | |||
| return g_steal_pointer (&new_deployments); | |||
Member
There was a problem hiding this comment.
The commit message should be s/rpmostree_syscore_filter_deployments/rpmostree_syscore_add_deployment/ right?
Member
Author
There was a problem hiding this comment.
Yeah, looks like it. I rebased and reworded ⬇️
This is prep for livefs. We need to tweak the logic from what core libostree has in `ostree_sysroot_simple_write_deployment()`, and while we could land improved logic there, I think it makes sense to carry this here until we're confident enough in the logic to make it ABI. This does depend on a [new libostree API](ostreedev/ostree#745) that allows writing deployments without doing cleanup. The `bump_mtime()` bit is also prep for livefs, carrying in this patch to avoid splitting things too much.
cgwalters
force-pushed
the
live-updates-prep
branch
from
ff88c96 to
21c8954
Compare
While nothing else besides cleanup right now would call this directly, the code should live close to the other very similar function: `rpmostree_syscore_add_deployment()`.
We now avoid doing cleanup twice.
I want to use this in livefs, where I'll end up doing some diff computations on the server and am currently rendering text there. It might also be a step towards using this in `db diff`.
cgwalters
force-pushed
the
live-updates-prep
branch
from
8224fb4 to
c42ede3
Compare
Member
Author
|
OK, this one should be ready. |
Member
rh-atomic-bot
pushed a commit
that referenced
this pull request
Apr 26, 2017
While nothing else besides cleanup right now would call this directly, the code should live close to the other very similar function: `rpmostree_syscore_add_deployment()`. Closes: #709 Approved by: jlebon
rh-atomic-bot
pushed a commit
that referenced
this pull request
Apr 26, 2017
We now avoid doing cleanup twice. Closes: #709 Approved by: jlebon
rh-atomic-bot
pushed a commit
that referenced
this pull request
Apr 26, 2017
I want to use this in livefs, where I'll end up doing some diff computations on the server and am currently rendering text there. It might also be a step towards using this in `db diff`. Closes: #709 Approved by: jlebon
|
☀️ Test successful - status-atomicjenkins |
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
3 participants
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.
Prep for: #652