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

RpmOstreeContext: remove unused params

Browse Source 
Pull request: #240
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2016-03-21 15:41:41 -04:00 committed by Colin Walters (automation)
parent 8594931c67
commit bf44928f40
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/rpmostree-container-builtins.c
View File

@ -104,7 +104,6 @@ roc_context_init (ROContainerContext *rocctx,
static gboolean
roc_context_prepare_for_root (ROContainerContext *rocctx,
const char *target,
RpmOstreeTreespec *treespec,
GCancellable *cancellable,
GError **error)
@ -285,7 +284,7 @@ rpmostree_container_builtin_assemble (int argc,
goto out;
}
if (!roc_context_prepare_for_root (rocctx, target_rootdir, treespec, cancellable, error))
if (!roc_context_prepare_for_root (rocctx, treespec, cancellable, error))
goto out;
/* --- Downloading metadata --- */
@ -308,7 +307,6 @@ rpmostree_container_builtin_assemble (int argc,
if (!rpmostree_context_assemble_commit (rocctx->ctx, tmpdir_dfd,
name,
install,
&commit,
cancellable, error))
goto out;
@ -483,7 +481,7 @@ rpmostree_container_builtin_upgrade (int argc, char **argv, GCancellable *cancel
else
target_new_root = glnx_strjoina (name, ".1");
if (!roc_context_prepare_for_root (rocctx, name, treespec, cancellable, error))
if (!roc_context_prepare_for_root (rocctx, treespec, cancellable, error))
goto out;
/* --- Downloading metadata --- */
@ -517,7 +515,6 @@ rpmostree_container_builtin_upgrade (int argc, char **argv, GCancellable *cancel
if (!rpmostree_context_assemble_commit (rocctx->ctx, tmpdir_dfd,
name,
install,
&new_commit_checksum,
cancellable, error))
goto out;

11
src/libpriv/rpmostree-core.c
View File

@ -1320,12 +1320,11 @@ add_to_transaction (rpmts ts,
gboolean
rpmostree_context_assemble_commit (RpmOstreeContext *self,
int tmpdir_dfd,
const char *name,
RpmOstreeInstall *install,
char **out_commit,
GCancellable *cancellable,
GError **error)
int tmpdir_dfd,
const char *name,
char **out_commit,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
HifContext *hifctx = self->hifctx;

11
src/libpriv/rpmostree-core.h
View File

@ -87,9 +87,8 @@ gboolean rpmostree_context_download_import (RpmOstreeContext *self,
GError **error);
gboolean rpmostree_context_assemble_commit (RpmOstreeContext *self,
int tmpdir_dfd,
const char *name,
RpmOstreeInstall *install,
char **out_commit,
GCancellable *cancellable,
GError **error);
int tmpdir_dfd,
const char *name,
char **out_commit,
GCancellable *cancellable,
GError **error);