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

core: make cachebranch finder function public

Browse Source 
Prep for replacement overrides.

Closes: #859
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-07-04 10:17:01 -07:00 committed by Atomic Bot
parent 63405d655b
commit 7b4134c8e6
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,12 +793,12 @@ checkout_pkg_metadata_by_dnfpkg (RpmOstreeContext *self,
return checkout_pkg_metadata (self, nevra, header, cancellable, error);
}
static gboolean
find_cache_branch_by_nevra (OstreeRepo *pkgcache,
const char *nevra,
char **out_cache_branch,
GCancellable *cancellable,
GError **error)
gboolean
rpmostree_find_cache_branch_by_nevra (OstreeRepo *pkgcache,
const char *nevra,
char **out_cache_branch,
GCancellable *cancellable,
GError **error)
{
/* there's no safe way to convert a nevra string to its cache branch, so let's
@ -832,7 +832,8 @@ rpmostree_pkgcache_find_pkg_header (OstreeRepo *pkgcache,
GError **error)
{
g_autofree char *cache_branch = NULL;
if (!find_cache_branch_by_nevra (pkgcache, nevra, &cache_branch, cancellable, error))
if (!rpmostree_find_cache_branch_by_nevra (pkgcache, nevra, &cache_branch,
cancellable, error))
return FALSE;
if (expected_sha256 != NULL)
@ -888,7 +889,7 @@ rpmostree_get_nevra_from_pkgcache (OstreeRepo *repo,
GError **error)
{
g_autofree char *ref = NULL;
if (!find_cache_branch_by_nevra (repo, nevra, &ref, cancellable, error))
if (!rpmostree_find_cache_branch_by_nevra (repo, nevra, &ref, cancellable, error))
return FALSE;
g_autofree char *rev = NULL;

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

@ -81,6 +81,13 @@ char *rpmostree_context_get_state_sha512 (RpmOstreeContext *self);
char *rpmostree_get_cache_branch_header (Header hdr);
char *rpmostree_get_cache_branch_pkg (DnfPackage *pkg);
gboolean
rpmostree_find_cache_branch_by_nevra (OstreeRepo *pkgcache,
const char *nevra,
char **out_cache_branch,
GCancellable *cancellable,
GError **error);
gboolean
rpmostree_pkgcache_find_pkg_header (OstreeRepo *pkgcache,
const char *nevra,