ahill/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 14:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop flatpak_cli_transaction_install

Browse Source 
Move this minor convenience api into its only user.
Using only generic FlatpakTransaction apis lets us
switch out transaction instances easily.

Closes: #2556
Approved by: alexlarsson
This commit is contained in:
Matthias Clasen 2019-01-10 17:54:13 -05:00 committed by Atomic Bot
parent 497b784d21
commit fd44da76e3
3 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/flatpak-builtins-install.c
View File

@ -474,8 +474,14 @@ flatpak_builtin_install (int argc, char **argv, GCancellable *cancellable, GErro
if (!flatpak_resolve_matching_refs (remote, dir, opt_yes, refs, id, &ref, error))
return FALSE;
if (!flatpak_cli_transaction_add_install (transaction, remote, ref, (const char **) opt_subpaths, error))
return FALSE;
if (!flatpak_transaction_add_install (transaction, remote, ref, (const char **)opt_subpaths, error))
{
if (!g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED))
return FALSE;
g_printerr (_("Skipping: %s\n"), (*error)->message);
g_clear_error (error);
}
}
if (!flatpak_cli_transaction_run (transaction, cancellable, error))

24
app/flatpak-cli-transaction.c
View File

@ -1064,30 +1064,6 @@ flatpak_cli_transaction_new (FlatpakDir *dir,
return (FlatpakTransaction *) g_steal_pointer (&self);
}
gboolean
flatpak_cli_transaction_add_install (FlatpakTransaction *transaction,
const char *remote,
const char *ref,
const char **subpaths,
GError **error)
{
g_autoptr(GError) local_error = NULL;
if (!flatpak_transaction_add_install (transaction, remote, ref, subpaths, &local_error))
{
if (g_error_matches (local_error, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED))
{
g_printerr (_("Skipping: %s\n"), local_error->message);
return TRUE;
}
g_propagate_error (error, g_steal_pointer (&local_error));
return FALSE;
}
return TRUE;
}
gboolean
flatpak_cli_transaction_run (FlatpakTransaction *transaction,
GCancellable *cancellable,

5
app/flatpak-cli-transaction.h
View File

@ -32,11 +32,6 @@ FlatpakTransaction * flatpak_cli_transaction_new (FlatpakDir * dir,
gboolean stop_on_first_error,
GError * *error);
gboolean flatpak_cli_transaction_add_install (FlatpakTransaction *self,
const char *remote,
const char *ref,
const char **subpaths,
GError **error);
gboolean flatpak_cli_transaction_was_aborted (FlatpakTransaction *transaction);
gboolean flatpak_cli_transaction_run (FlatpakTransaction *transaction,