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

Merge pull request #203 from cgwalters/shared-libhif-review

Browse Source 
Honor --proxy again, tweak internal libhif API
This commit is contained in:
Colin Walters 2016-01-10 09:26:33 -05:00
commit 81bd21e77b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,9 @@ install_packages_in_root (RpmOstreeTreeComposeContext *self,
NULL);
gs_free char *ret_new_inputhash = NULL;
hifctx = _rpmostree_libhif_get_default ();
hifctx = _rpmostree_libhif_new_default ();
if (opt_proxy)
hif_context_set_http_proxy (hifctx, opt_proxy);
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);

2
src/libpriv/rpmostree-hif.c
View File

@ -28,7 +28,7 @@
#include "rpmostree-cleanup.h"
HifContext *
_rpmostree_libhif_get_default (void)
_rpmostree_libhif_new_default (void)
{
HifContext *hifctx;

2
src/libpriv/rpmostree-hif.h
View File

@ -24,7 +24,7 @@
#include <libhif.h>
#include <libhif/hif-utils.h>
HifContext *_rpmostree_libhif_get_default (void);
HifContext *_rpmostree_libhif_new_default (void);
gboolean _rpmostree_libhif_setup (HifContext *context,
GCancellable *cancellable,