Skip to content

Prep patches for --ex-lockfile-strict#2057

Merged
openshift-merge-robot merged 5 commits intocoreos:masterfrom
jlebon:pr/strict-lockfile-prep
Apr 15, 2020
Merged

Prep patches for --ex-lockfile-strict#2057
openshift-merge-robot merged 5 commits intocoreos:masterfrom
jlebon:pr/strict-lockfile-prep

Conversation

@jlebon
Copy link
Copy Markdown
Member

@jlebon jlebon commented Apr 14, 2020

See individual commit messages

Minor cosmetic change; rename the variables so they match the name of
the options they represent.
Comment thread src/libpriv/rpmostree-core.c Outdated
Comment thread tests/compose.sh
@jlebon jlebon force-pushed the pr/strict-lockfile-prep branch from 8c857e1 to 84c78f1 Compare April 14, 2020 21:04
DnfPackageSet *pset = dnf_packageset_new (sack);
for (guint i = 0; i < pkglist->len; i++)
dnf_packageset_add (pset, pkglist->pdata[i]);
DnfPackageSet *pset = hy_query_run_set (query);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I have to claim a bit of ignorance on this one. It looks OK based on what I see here.

Comment thread src/libpriv/rpmostree-core.c Outdated
@jlebon jlebon force-pushed the pr/strict-lockfile-prep branch from 84c78f1 to fe65986 Compare April 14, 2020 21:24
@cgwalters
Copy link
Copy Markdown
Member

cgwalters commented Apr 14, 2020

OK, I think the behavior for the first commit makes sense for composes, but doesn't for the client side; We need to respect the default libdnf behavior there. That's why CI is failing.

Basically only disable all repos if a repos member is set, otherwise use the libdnf default.

@jlebon jlebon force-pushed the pr/strict-lockfile-prep branch from fe65986 to e86138e Compare April 15, 2020 01:07
jlebon added 4 commits April 14, 2020 23:23
Otherwise, it muddles testing in `test-lockfile.sh` where we want to be
in full control of all the lockfiles fed to `rpm-ostree compose tree`.
The garbage collection issue should be fixed now, and it's just nicer on
developers' cache to stay on the same commit. And again, it's a nice
sanity-check to know that we're always able to compose an older tree.
That said, we probably should still bump this from time to time.

While we're here, add some comments for making it easier to match `popd`
calls with the original `pushd`.
Instead of manually recreating the packageset ourselves.
@jlebon jlebon force-pushed the pr/strict-lockfile-prep branch from e86138e to cc6a8a9 Compare April 15, 2020 03:24
@jlebon
Copy link
Copy Markdown
Member Author

jlebon commented Apr 15, 2020

✔️ continuous-integration/jenkins/pr-merge — This commit looks good

🎉

@cgwalters
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, jlebon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 357c527 into coreos:master Apr 15, 2020
@jlebon jlebon deleted the pr/strict-lockfile-prep branch April 23, 2023 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants