From c0165095480abd9caa525956caa3608bcb875ac1 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 17 Jul 2018 12:22:26 -0400 Subject: [PATCH] libdnf: Bump and disable html and man pages Skip building man pages and HTML docs for our embedded libdnf to speed up builds. This bump also pulls in a fix to ensure we never try to install src packages from `dnf_context_install()`. See: https://github.com/projectatomic/libdnf/pull/3 Update submodule: libdnf Closes: #1463 Approved by: jlebon --- configure.ac | 2 ++ libdnf | 2 +- src/libpriv/rpmostree-rpm-util.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 20a941b4..6a19e4f5 100644 --- a/configure.ac +++ b/configure.ac @@ -261,6 +261,8 @@ dnl arbitrary path - we don't actually install there. -DSHARE_INSTALL_PREFIX:PATH=/usr/libexec/rpm-ostree/share \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DWITH_SWDB:BOOL=0 \ + -DWITH_HTML:BOOL=0 \ + -DWITH_MAN:BOOL=0 \ ${cmake_args} ../libdnf) || exit 1 AC_CONFIG_FILES([ diff --git a/libdnf b/libdnf index b3fcc53f..a2630dfe 160000 --- a/libdnf +++ b/libdnf @@ -1 +1 @@ -Subproject commit b3fcc53f6f3baf4f51f836f5e1eb54eb82d5df49 +Subproject commit a2630dfe8416ce90f283f644fa5cbb936c5327ee diff --git a/src/libpriv/rpmostree-rpm-util.c b/src/libpriv/rpmostree-rpm-util.c index 70238759..23f2c217 100644 --- a/src/libpriv/rpmostree-rpm-util.c +++ b/src/libpriv/rpmostree-rpm-util.c @@ -1106,7 +1106,7 @@ rpmostree_get_matching_packages (DnfSack *sack, HySubject subject = NULL; subject = hy_subject_create (pattern); - selector = hy_subject_get_best_selector (subject, sack); + selector = hy_subject_get_best_selector (subject, sack, false); matches = hy_selector_matches (selector); hy_selector_free (selector);