Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core: Mark all repos as "modular hotfixes" #1961

Merged
merged 1 commit into from
Jan 9, 2020
Merged

core: Mark all repos as "modular hotfixes" #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/libpriv/rpmostree-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,12 @@ rpmostree_context_download_metadata (RpmOstreeContext *self,
* So for now, let's tell libdnf that we do want to be able to see them. See:
* https://github.com/projectatomic/rpm-ostree/issues/1435 */
dnf_sack_set_module_excludes (dnf_context_get_sack (self->dnfctx), NULL);
/* And also mark all repos as hotfix repos so that we can indiscriminately cherry-pick
* from modular repos and non-modular repos alike. */
g_autoptr(GPtrArray) repos =
rpmostree_get_enabled_rpmmd_repos (self->dnfctx, DNF_REPO_ENABLED_PACKAGES);
for (guint i = 0; i < repos->len; i++)
dnf_repo_set_module_hotfixes (repos->pdata[i], TRUE);

return TRUE;
}
Expand Down
15 changes: 0 additions & 15 deletions tests/compose/test-basic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,6 @@ echo gpgcheck=0 >> yumrepo.repo
ln "$PWD/yumrepo.repo" config/yumrepo.repo
treefile_append "packages" '["foobar"]'

###
# MAJOR HACK ALERT; drop modular pkgs because libdnf in the non-unified path
# wants the modulemd available in the rpmmd, which neither our cache repo nor
# pool have
treefile_pyedit "
tf['packages'].remove('afterburn')
tf['packages'].remove('afterburn-dracut')
tf['packages'].remove('fedora-coreos-pinger')
tf['packages'].remove('sssd')
"
# have mercy
echo 'exclude=libnghttp2' >> config/cache.repo
build_rpm fake-libnghttp2 version 1.40.0 provides "libnghttp2.so.14()(64bit)"
###

treefile_pyedit "tf['add-commit-metadata']['foobar'] = 'bazboo'"
treefile_pyedit "tf['add-commit-metadata']['overrideme'] = 'old var'"

Expand Down