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

app/compose: Drop helper cachedir_dfd() function

Browse Source 
We don't actually need this helper here since we always initialize
`self->cachedir_dfd` nowadays. I took a closer look at this initially
because it was confusing ctags due to the function being named the same
as the struct member it returns.

Closes: #1658
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-11-02 13:26:20 -04:00 committed by Atomic Bot
parent 6d39cfa78f
commit 46edef0017
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,12 +155,6 @@ rpm_ostree_tree_compose_context_free (RpmOstreeTreeComposeContext *ctx)
} }
G_DEFINE_AUTOPTR_CLEANUP_FUNC(RpmOstreeTreeComposeContext, rpm_ostree_tree_compose_context_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC(RpmOstreeTreeComposeContext, rpm_ostree_tree_compose_context_free)
static int
cachedir_dfd (RpmOstreeTreeComposeContext *self)
{
return self->cachedir_dfd != -1 ? self->cachedir_dfd : self->workdir_dfd;
}
static void static void
on_hifstate_percentage_changed (DnfState *hifstate, on_hifstate_percentage_changed (DnfState *hifstate,
guint percentage, guint percentage,
@ -247,7 +241,7 @@ install_packages (RpmOstreeTreeComposeContext *self,
*/ */
if (opt_unified_core) if (opt_unified_core)
{ {
self->pkgcache_repo = ostree_repo_create_at (cachedir_dfd (self), "pkgcache-repo", self->pkgcache_repo = ostree_repo_create_at (self->cachedir_dfd, "pkgcache-repo",
OSTREE_REPO_MODE_BARE_USER, NULL, OSTREE_REPO_MODE_BARE_USER, NULL,
cancellable, error); cancellable, error);
if (!self->pkgcache_repo) if (!self->pkgcache_repo)