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

Extract a shared internal rpmostree-hif.[ch]

Browse Source 
As we start to do more package things, extract common helper functions
around HifContext * that by default operates on the system root.

Some of these bits should go in libhif, but the immediate plan is to
iterate here, then push downwards later.
This commit is contained in:
Colin Walters 2015-02-11 08:43:55 -05:00
parent c1488d7e96
commit 236a3c46cd
4 changed files with 169 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-libpriv.am
View File

@ -28,6 +28,8 @@ librpmostreepriv_la_SOURCES = \
src/libpriv/rpmostree-passwd-util.h \
src/libpriv/rpmostree-refts.h \
src/libpriv/rpmostree-refts.c \
src/libpriv/rpmostree-hif.c \
src/libpriv/rpmostree-hif.h \
src/libpriv/rpmostree-refsack.h \
src/libpriv/rpmostree-refsack.c \
src/libpriv/rpmostree-cleanup.h \

73
src/app/rpmostree-compose-builtin-tree.c
View File

@ -24,7 +24,6 @@
#include <glib-unix.h>
#include <json-glib/json-glib.h>
#include <gio/gunixoutputstream.h>
#include <rpm/rpmsq.h>
#include <libhif.h>
#include <libhif/hif-utils.h>
#include <stdio.h>
@ -33,6 +32,7 @@
#include "rpmostree-compose-builtins.h"
#include "rpmostree-util.h"
#include "rpmostree-hif.h"
#include "rpmostree-json-parsing.h"
#include "rpmostree-cleanup.h"
#include "rpmostree-postprocess.h"
@ -192,29 +192,12 @@ install_packages_in_root (RpmOstreeTreeComposeContext *self,
NULL);
gs_free char *ret_new_inputhash = NULL;
/* We can be control-c'd at any time */
#if BUILDOPT_HAVE_RPMSQ_SET_INTERRUPT_SAFETY
rpmsqSetInterruptSafety (FALSE);
#endif
/* Apparently there's only one process-global macro context;
* realistically, we're going to have to refactor all of the RPM
* stuff to a subprocess.
*/
hifctx = hif_context_new ();
hif_context_set_http_proxy (hifctx, opt_proxy ? opt_proxy : g_getenv ("http_proxy"));
hifctx = _rpmostree_libhif_get_default ();
hif_context_set_install_root (hifctx, gs_file_get_path_cached (yumroot));
hif_context_set_cache_dir (hifctx, cachedir);
hif_context_set_cache_age (hifctx, G_MAXUINT);
hif_context_set_solv_dir (hifctx, solvdir);
hif_context_set_lock_dir (hifctx, lockdir);
hif_context_set_check_disk_space (hifctx, FALSE);
hif_context_set_check_transaction (hifctx, FALSE);
hif_context_set_yumdb_enabled (hifctx, FALSE);
hif_context_set_repo_dir (hifctx, gs_file_get_path_cached (contextdir));
{ JsonNode *install_langs_n =
@ -239,28 +222,21 @@ install_packages_in_root (RpmOstreeTreeComposeContext *self,
}
}
if (!hif_context_setup (hifctx, cancellable, error))
if (!_rpmostree_libhif_setup (hifctx, cancellable, error))
goto out;
/* Forcibly override rpm/librepo SIGINT handlers. We always operate
* in a fully idempotent/atomic mode, and can be killed at any time.
*/
signal (SIGINT, SIG_DFL);
signal (SIGTERM, SIG_DFL);
/* Bind the json \"repos\" member to the hif state, which looks at the
* enabled= member of the repos file. By default we forcibly enable
* only repos which are specified, ignoring the enabled= flag.
*/
{
GPtrArray *sources;
JsonArray *enable_repos = NULL;
gs_unref_hashtable GHashTable *repos_to_enable =
g_hash_table_new (g_str_hash, g_str_equal);
guint i;
guint n;
sources = hif_context_get_sources (hifctx);
_rpmostree_libhif_repos_disable_all (hifctx);
if (!json_object_has_member (treedata, "repos"))
{
@ -277,45 +253,8 @@ install_packages_in_root (RpmOstreeTreeComposeContext *self,
const char *reponame = _rpmostree_jsonutil_array_require_string_element (enable_repos, i, error);
if (!reponame)
goto out;
g_hash_table_add (repos_to_enable, (char*)reponame);
}
for (i = 0; i < sources->len; i++)
{
HifSource *src = g_ptr_array_index (sources, i);
const char *id = hif_source_get_id (src);
/* Note side effect here */
if (g_hash_table_remove (repos_to_enable, id))
{
hif_source_set_enabled (src, HIF_SOURCE_ENABLED_PACKAGES);
#ifdef HAVE_HIF_SOURCE_SET_REQUIRED
hif_source_set_required (src, TRUE);
#endif
}
else
hif_source_set_enabled (src, HIF_SOURCE_ENABLED_NONE);
}
/* Did we have any leftovers? */
if (g_hash_table_size (repos_to_enable) > 0)
{
GString *repos_str = g_string_new ("");
GHashTableIter hiter;
gpointer key, value;
g_hash_table_iter_init (&hiter, repos_to_enable);
while (g_hash_table_iter_next (&hiter, &key, &value))
{
if (repos_str->len > 0)
g_string_append (repos_str, ", ");
g_string_append (repos_str, (char*) key);
}
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Repositories specified not found: %s", repos_str->str);
g_string_free (repos_str, TRUE);
goto out;
if (!_rpmostree_libhif_repos_enable_by_name (hifctx, reponame, error))
goto out;
}
}

124
src/libpriv/rpmostree-hif.c Normal file
View File

@ -0,0 +1,124 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright (C) 2014 Colin Walters <walters@verbum.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2 of the licence or (at
* your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <glib-unix.h>
#include <rpm/rpmsq.h>
#include <gio/gunixoutputstream.h>
#include "rpmostree-hif.h"
#include "rpmostree-cleanup.h"
HifContext *
_rpmostree_libhif_get_default (void)
{
HifContext *hifctx;
/* We can be control-c'd at any time */
#if BUILDOPT_HAVE_RPMSQ_SET_INTERRUPT_SAFETY
rpmsqSetInterruptSafety (FALSE);
#endif
hifctx = hif_context_new ();
hif_context_set_http_proxy (hifctx, g_getenv ("http_proxy"));
hif_context_set_repo_dir (hifctx, "/etc/yum.repos.d");
hif_context_set_cache_dir (hifctx, "/var/cache/rpm-ostree/metadata");
hif_context_set_solv_dir (hifctx, "/var/cache/rpm-ostree/solv");
hif_context_set_lock_dir (hifctx, "/run/rpm-ostree/lock");
hif_context_set_check_disk_space (hifctx, FALSE);
hif_context_set_check_transaction (hifctx, FALSE);
hif_context_set_yumdb_enabled (hifctx, FALSE);
return hifctx;
}
gboolean
_rpmostree_libhif_setup (HifContext *context,
GCancellable *cancellable,
GError **error)
{
if (!hif_context_setup (context, cancellable, error))
return FALSE;
/* Forcibly override rpm/librepo SIGINT handlers. We always operate
* in a fully idempotent/atomic mode, and can be killed at any time.
*/
signal (SIGINT, SIG_DFL);
signal (SIGTERM, SIG_DFL);
return TRUE;
}
void
_rpmostree_libhif_repos_disable_all (HifContext *context)
{
GPtrArray *sources;
guint i;
sources = hif_context_get_sources (context);
for (i = 0; i < sources->len; i++)
{
HifSource *src = sources->pdata[i];
hif_source_set_enabled (src, HIF_SOURCE_ENABLED_NONE);
}
}
gboolean
_rpmostree_libhif_repos_enable_by_name (HifContext *context,
const char *name,
GError **error)
{
gboolean ret = FALSE;
GPtrArray *sources;
guint i;
gboolean found = FALSE;
sources = hif_context_get_sources (context);
for (i = 0; i < sources->len; i++)
{
HifSource *src = sources->pdata[i];
const char *id = hif_source_get_id (src);
if (strcmp (name, id) != 0)
continue;
hif_source_set_enabled (src, HIF_SOURCE_ENABLED_PACKAGES);
#ifdef HAVE_HIF_SOURCE_SET_REQUIRED
hif_source_set_required (src, TRUE);
#endif
found = TRUE;
break;
}
if (!found)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Unknown rpm-md repository: %s", name);
goto out;
}
ret = TRUE;
out:
return ret;
}

37
src/libpriv/rpmostree-hif.h Normal file
View File

@ -0,0 +1,37 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright (C) 2015 Colin Walters <walters@verbum.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2 of the licence or (at
* your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
#pragma once
#include <gio/gio.h>
#include <libhif.h>
#include <libhif/hif-utils.h>
HifContext *_rpmostree_libhif_get_default (void);
gboolean _rpmostree_libhif_setup (HifContext *context,
GCancellable *cancellable,
GError **error);
void _rpmostree_libhif_repos_disable_all (HifContext *context);
gboolean _rpmostree_libhif_repos_enable_by_name (HifContext *context,
const char *name,
GError **error);