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

compose: Remove unused treefile_rs parameter

Browse Source 
Prep for further cleanup.
This commit is contained in:
Colin Walters 2021-01-26 20:21:57 +00:00 committed by OpenShift Merge Robot
parent 55ea74a5bd
commit ea81a1ee6e
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/rpmostree-compose-builtin-rojig.cxx
View File

@ -528,7 +528,7 @@ impl_write_rojig (RpmOstreeRojigCompose *self,
return FALSE;
if (!rpmostree_rootfs_postprocess_common (self->rootfs_dfd, cancellable, error))
return FALSE;
if (!rpmostree_postprocess_final (self->rootfs_dfd, self->treefile_rs, self->treefile, TRUE,
if (!rpmostree_postprocess_final (self->rootfs_dfd, self->treefile, TRUE,
cancellable, error))
return FALSE;

4
src/app/rpmostree-compose-builtin-tree.cxx
View File

@ -1087,7 +1087,7 @@ impl_commit_tree (RpmOstreeTreeComposeContext *self,
return FALSE;
if (!rpmostree_rootfs_postprocess_common (self->rootfs_dfd, cancellable, error))
return FALSE;
if (!rpmostree_postprocess_final (self->rootfs_dfd, self->treefile_rs,
if (!rpmostree_postprocess_final (self->rootfs_dfd,
self->treefile, self->unified_core_and_fuse,
cancellable, error))
return FALSE;
@ -1327,7 +1327,7 @@ rpmostree_compose_builtin_postprocess (int argc,
return FALSE;
if (!rpmostree_rootfs_postprocess_common (rootfs_dfd, cancellable, error))
return FALSE;
if (!rpmostree_postprocess_final (rootfs_dfd, treefile_rs, treefile, opt_unified_core,
if (!rpmostree_postprocess_final (rootfs_dfd, treefile, opt_unified_core,
cancellable, error))
return FALSE;
return TRUE;

1
src/libpriv/rpmostree-postprocess.cxx
View File

@ -953,7 +953,6 @@ postprocess_selinux_policy_store_location (int rootfs_dfd,
*/
gboolean
rpmostree_postprocess_final (int rootfs_dfd,
RORTreefile *treefile_rs,
JsonObject *treefile,
gboolean unified_core_mode,
GCancellable *cancellable,

1
src/libpriv/rpmostree-postprocess.h
View File

@ -89,7 +89,6 @@ rpmostree_prepare_rootfs_for_commit (int src_rootfs_dfd,
gboolean
rpmostree_postprocess_final (int rootfs_dfd,
RORTreefile *treefile_rs,
JsonObject *treefile,
gboolean unified_core_mode,
GCancellable *cancellable,