diff --git a/src/daemon/rpmostree-sysroot-core.cxx b/src/daemon/rpmostree-sysroot-core.cxx index 1f8adc09..42cb7990 100644 --- a/src/daemon/rpmostree-sysroot-core.cxx +++ b/src/daemon/rpmostree-sysroot-core.cxx @@ -128,8 +128,7 @@ add_package_refs_to_set (RpmOstreeRefSack *rsack, for (guint i = 0; i < pkglist->len; i++) { auto pkg = static_cast(pkglist->pdata[i]); - g_autofree char *pkgref = - is_rojig ? rpmostree_get_rojig_branch_pkg (pkg) : rpmostree_get_cache_branch_pkg (pkg); + g_autofree char *pkgref = rpmostree_get_cache_branch_pkg (pkg); g_hash_table_add (referenced_pkgs, util::move_nullify (pkgref)); } } diff --git a/src/libpriv/rpmostree-rpm-util.cxx b/src/libpriv/rpmostree-rpm-util.cxx index d44dd53a..57bdda4e 100644 --- a/src/libpriv/rpmostree-rpm-util.cxx +++ b/src/libpriv/rpmostree-rpm-util.cxx @@ -1418,15 +1418,6 @@ rpmostree_get_cache_branch_header (Header hdr) 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 */ char * rpmostree_get_cache_branch_pkg (DnfPackage *pkg) @@ -1436,14 +1427,6 @@ rpmostree_get_cache_branch_pkg (DnfPackage *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* rpmostree_get_enabled_rpmmd_repos (DnfContext *dnfctx, DnfRepoEnabled enablement) diff --git a/src/libpriv/rpmostree-rpm-util.h b/src/libpriv/rpmostree-rpm-util.h index 86de549b..cdc39367 100644 --- a/src/libpriv/rpmostree-rpm-util.h +++ b/src/libpriv/rpmostree-rpm-util.h @@ -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_header (Header hdr); -char *rpmostree_get_rojig_branch_header (Header hdr); char *rpmostree_get_cache_branch_pkg (DnfPackage *pkg); -char *rpmostree_get_rojig_branch_pkg (DnfPackage *pkg); gboolean rpmostree_decompose_nevra (const char *nevra,