From 370c5e5b63c35123eeea6efe96fa28a533a3fb3f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 26 May 2015 10:43:33 -0400 Subject: [PATCH] compose: Make use of hif_source_set_required() We noticed that tree composes failed with a missing `atomic` package, when really what happend is Fedora 22 was released and the repo metadata moved from `development/` to `released/`. See https://github.com/hughsie/libhif/pull/47 --- configure.ac | 5 +++++ src/app/rpmostree-compose-builtin-tree.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index e155771a..95ea5bd4 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,11 @@ AC_TRY_COMPILE([#include [AC_MSG_RESULT([yes]); BUILDOPT_HAWKEY_SACK_CREATE2=1]) AC_DEFINE_UNQUOTED(BUILDOPT_HAWKEY_SACK_CREATE2, $BUILDOPT_HAWKEY_SACK_CREATE2, [Hawkey ABI change]) +save_LIBS=$LIBS +LIBS=$PKGDEP_RPMOSTREE_LIBS +AC_CHECK_FUNCS(hif_source_set_required) +LIBS=$save_LIBS + AC_PATH_PROG([XSLTPROC], [xsltproc]) GLIB_TESTS diff --git a/src/app/rpmostree-compose-builtin-tree.c b/src/app/rpmostree-compose-builtin-tree.c index 282bccb7..d9533d9c 100644 --- a/src/app/rpmostree-compose-builtin-tree.c +++ b/src/app/rpmostree-compose-builtin-tree.c @@ -284,6 +284,10 @@ install_packages_in_root (RpmOstreeTreeComposeContext *self, hif_source_set_enabled (src, HIF_SOURCE_ENABLED_NONE); else hif_source_set_enabled (src, HIF_SOURCE_ENABLED_PACKAGES); + +#ifdef HAVE_HIF_SOURCE_SET_REQUIRED + hif_source_set_required (src, TRUE); +#endif } }