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

origin: drop GCancellable arg and rename function

Browse Source 
1. There's no point in passing a GCancellable in those cases. All the
   manipulations should be short-lived.
2. Rename delete_packages to remove_packages, since "remove" is the
   proper antonym of "add".

Closes: #819
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-06-05 12:33:18 -04:00 committed by Atomic Bot
parent 02f1fa678e
commit a6c9b6213c
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/daemon/rpmostreed-transaction-types.c
View File

@ -573,8 +573,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
gboolean changed = FALSE;
if (self->packages_removed)
{
if (!rpmostree_origin_delete_packages (origin, self->packages_removed,
cancellable, error))
if (!rpmostree_origin_remove_packages (origin, self->packages_removed, error))
return FALSE;
/* in reality, there may not be any new layer required (if e.g. we're
@ -585,8 +584,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
if (self->packages_added)
{
if (!rpmostree_origin_add_packages (origin, self->packages_added,
FALSE, cancellable, error))
if (!rpmostree_origin_add_packages (origin, self->packages_added, FALSE, error))
return FALSE;
changed = TRUE;
@ -615,8 +613,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
if (pkgs->len > 0)
{
g_ptr_array_add (pkgs, NULL);
if (!rpmostree_origin_add_packages (origin, (char**)pkgs->pdata,
TRUE, cancellable, error))
if (!rpmostree_origin_add_packages (origin, (char**)pkgs->pdata, TRUE, error))
return FALSE;
}

4
src/libpriv/rpmostree-origin.c
View File

@ -388,7 +388,6 @@ gboolean
rpmostree_origin_add_packages (RpmOstreeOrigin *origin,
char **packages,
gboolean local,
GCancellable *cancellable,
GError **error)
{
gboolean changed = FALSE;
@ -443,9 +442,8 @@ rpmostree_origin_add_packages (RpmOstreeOrigin *origin,
}
gboolean
rpmostree_origin_delete_packages (RpmOstreeOrigin *origin,
rpmostree_origin_remove_packages (RpmOstreeOrigin *origin,
char **packages,
GCancellable *cancellable,
GError **error)
{
gboolean changed = FALSE;

4
src/libpriv/rpmostree-origin.h
View File

@ -107,13 +107,11 @@ gboolean
rpmostree_origin_add_packages (RpmOstreeOrigin *origin,
char **packages,
gboolean local,
GCancellable *cancellable,
GError **error);
gboolean
rpmostree_origin_delete_packages (RpmOstreeOrigin *origin,
rpmostree_origin_remove_packages (RpmOstreeOrigin *origin,
char **packages,
GCancellable *cancellable,
GError **error);
void