keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libpriv/core: Use new download_metadata libdnf API

Browse Source 
Allow callers to pass flags directly to libdnf depending on their needs.
Make use of this in `refresh-md` at least so that we don't even bother
loading the rpmdb since we're just interested in downloading fresh bits.

Closes: #1268
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-03-05 18:08:38 +00:00 committed by Atomic Bot
parent bc01208d13
commit 1b580ce201
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/daemon/rpmostreed-transaction-types.c
View File

@ -1528,7 +1528,9 @@ refresh_md_transaction_execute (RpmostreedTransaction *transaction,
/* point libdnf to our repos dir */
rpmostree_context_configure_from_deployment (ctx, sysroot, cfg_merge_deployment);
if (!rpmostree_context_download_metadata (ctx, cancellable, error))
/* don't even bother loading the rpmdb */
if (!rpmostree_context_download_metadata (ctx, DNF_CONTEXT_SETUP_SACK_FLAG_SKIP_RPMDB,
cancellable, error))
return FALSE;
return TRUE;

11
src/libpriv/rpmostree-core.c
View File

@ -1040,6 +1040,7 @@ rpmostree_get_nevra_from_pkgcache (OstreeRepo *repo,
/* Initiate download of rpm-md */
gboolean
rpmostree_context_download_metadata (RpmOstreeContext *self,
DnfContextSetupSackFlags flags,
GCancellable *cancellable,
GError **error)
{
@ -1049,6 +1050,8 @@ rpmostree_context_download_metadata (RpmOstreeContext *self,
* https://github.com/projectatomic/rpm-ostree/issues/1127
*/
if (self->rojig_pure)
flags |= DNF_CONTEXT_SETUP_SACK_FLAG_SKIP_FILELISTS;
if (flags & DNF_CONTEXT_SETUP_SACK_FLAG_SKIP_FILELISTS)
dnf_context_set_enable_filelists (self->dnfctx, FALSE);
g_autoptr(GPtrArray) rpmmd_repos =
@ -1056,11 +1059,12 @@ rpmostree_context_download_metadata (RpmOstreeContext *self,
if (self->pkgcache_only)
{
/* we already disabled all the repos in setup */
g_assert_cmpint (rpmmd_repos->len, ==, 0);
/* this is essentially a no-op */
g_autoptr(DnfState) hifstate = dnf_state_new ();
if (!dnf_context_setup_sack (self->dnfctx, hifstate, error))
if (!dnf_context_setup_sack_with_flags (self->dnfctx, hifstate, flags, error))
return FALSE;
/* Note early return; no repos to fetch. */
@ -1131,11 +1135,12 @@ rpmostree_context_download_metadata (RpmOstreeContext *self,
guint progress_sigid = g_signal_connect (hifstate, "percentage-changed",
G_CALLBACK (on_hifstate_percentage_changed),
"Importing metadata");
/* This will check the metadata again, but it *should* hit the cache; down
* the line we should really improve the libdnf API around all of this.
*/
DECLARE_RPMSIGHANDLER_RESET;
if (!dnf_context_setup_sack (self->dnfctx, hifstate, error))
if (!dnf_context_setup_sack_with_flags (self->dnfctx, hifstate, flags, error))
return FALSE;
g_signal_handler_disconnect (hifstate, progress_sigid);
rpmostree_output_progress_end ();
@ -1895,7 +1900,7 @@ rpmostree_context_prepare (RpmOstreeContext *self,
/* setup sack if not yet set up */
if (dnf_context_get_sack (dnfctx) == NULL)
{
if (!rpmostree_context_download_metadata (self, cancellable, error))
if (!rpmostree_context_download_metadata (self, 0, cancellable, error))
return FALSE;
journal_rpmmd_info (self);
}

5
src/libpriv/rpmostree-core.h
View File

@ -153,8 +153,9 @@ rpmostree_get_nevra_from_pkgcache (OstreeRepo *repo,
GError **error);
gboolean rpmostree_context_download_metadata (RpmOstreeContext *context,
GCancellable *cancellable,
GError **error);
DnfContextSetupSackFlags flags,
GCancellable *cancellable,
GError **error);
/* This API allocates an install context, use with one of the later ones */
gboolean rpmostree_context_prepare (RpmOstreeContext *self,