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

app/compose: Drop GFile usage from package install path

Browse Source 
Prep for unified core.

Closes: #943
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-08-23 21:31:57 -04:00 committed by Atomic Bot
parent addc53a707
commit a4ca8c8888
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,6 @@ treefile_sanity_checks (JsonObject *treedata,
static gboolean
install_packages_in_root (RpmOstreeTreeComposeContext *self,
JsonObject *treedata,
GFile *yumroot,
int rootfs_dfd,
char **packages,
gboolean *out_unmodified,
@ -404,7 +403,8 @@ install_packages_in_root (RpmOstreeTreeComposeContext *self,
g_autoptr(RpmOstreeTreespec) treespec_value = rpmostree_treespec_new_from_keyfile (treespec, &tmp_error);
g_assert_no_error (tmp_error);
if (!rpmostree_context_setup (self->corectx, gs_file_get_path_cached (yumroot), NULL, treespec_value,
g_autofree char *tmprootfs_abspath = glnx_fdrel_abspath (rootfs_dfd, ".");
if (!rpmostree_context_setup (self->corectx, tmprootfs_abspath, NULL, treespec_value,
cancellable, error))
return FALSE;
}
@ -877,7 +877,7 @@ impl_compose_tree (const char *treefile_pathstr,
g_autofree char *new_inputhash = NULL;
{ gboolean unmodified = FALSE;
if (!install_packages_in_root (self, treefile, yumroot, rootfs_fd,
if (!install_packages_in_root (self, treefile, rootfs_fd,
(char**)packages->pdata,
opt_force_nocache ? NULL : &unmodified,
&new_inputhash,