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

util: Remove rojig cache branch mapping functions

Browse Source 
Not used.
This commit is contained in:
Colin Walters 2021-05-19 14:22:00 -04:00
parent 05bc9beac5
commit 5c0b64535a
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/daemon/rpmostree-sysroot-core.cxx
View File

@ -128,8 +128,7 @@ add_package_refs_to_set (RpmOstreeRefSack *rsack,
for (guint i = 0; i < pkglist->len; i++) for (guint i = 0; i < pkglist->len; i++)
{ {
auto pkg = static_cast<DnfPackage *>(pkglist->pdata[i]); auto pkg = static_cast<DnfPackage *>(pkglist->pdata[i]);
g_autofree char *pkgref = g_autofree char *pkgref = rpmostree_get_cache_branch_pkg (pkg);
is_rojig ? rpmostree_get_rojig_branch_pkg (pkg) : rpmostree_get_cache_branch_pkg (pkg);
g_hash_table_add (referenced_pkgs, util::move_nullify (pkgref)); g_hash_table_add (referenced_pkgs, util::move_nullify (pkgref));
} }
} }

17
src/libpriv/rpmostree-rpm-util.cxx
View File

@ -1418,15 +1418,6 @@ rpmostree_get_cache_branch_header (Header hdr)
return rpmostree_get_cache_branch_for_n_evr_a (name, evr, arch); return rpmostree_get_cache_branch_for_n_evr_a (name, evr, arch);
} }
char *
rpmostree_get_rojig_branch_header (Header hdr)
{
g_autofree char *name = headerGetAsString (hdr, RPMTAG_NAME);
g_autofree char *evr = headerGetAsString (hdr, RPMTAG_EVR);
g_autofree char *arch = headerGetAsString (hdr, RPMTAG_ARCH);
return get_branch_for_n_evr_a ("rojig", name, evr, arch);
}
/* Return the ostree cache branch from a libdnf Package */ /* Return the ostree cache branch from a libdnf Package */
char * char *
rpmostree_get_cache_branch_pkg (DnfPackage *pkg) rpmostree_get_cache_branch_pkg (DnfPackage *pkg)
@ -1436,14 +1427,6 @@ rpmostree_get_cache_branch_pkg (DnfPackage *pkg)
dnf_package_get_arch (pkg)); dnf_package_get_arch (pkg));
} }
char *
rpmostree_get_rojig_branch_pkg (DnfPackage *pkg)
{
return get_branch_for_n_evr_a ("rojig", dnf_package_get_name (pkg),
dnf_package_get_evr (pkg),
dnf_package_get_arch (pkg));
}
GPtrArray* GPtrArray*
rpmostree_get_enabled_rpmmd_repos (DnfContext *dnfctx, rpmostree_get_enabled_rpmmd_repos (DnfContext *dnfctx,
DnfRepoEnabled enablement) DnfRepoEnabled enablement)

2
src/libpriv/rpmostree-rpm-util.h
View File

@ -219,9 +219,7 @@ rpmostree_create_rpmdb_pkglist_variant (int dfd,
char * rpmostree_get_cache_branch_for_n_evr_a (const char *name, const char *evr, const char *arch); char * rpmostree_get_cache_branch_for_n_evr_a (const char *name, const char *evr, const char *arch);
char *rpmostree_get_cache_branch_header (Header hdr); char *rpmostree_get_cache_branch_header (Header hdr);
char *rpmostree_get_rojig_branch_header (Header hdr);
char *rpmostree_get_cache_branch_pkg (DnfPackage *pkg); char *rpmostree_get_cache_branch_pkg (DnfPackage *pkg);
char *rpmostree_get_rojig_branch_pkg (DnfPackage *pkg);
gboolean gboolean
rpmostree_decompose_nevra (const char *nevra, rpmostree_decompose_nevra (const char *nevra,