From fd44da76e35fa066c1f949014e2942d0a846b151 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 10 Jan 2019 17:54:13 -0500 Subject: [PATCH] Drop flatpak_cli_transaction_install 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 --- app/flatpak-builtins-install.c | 10 ++++++++-- app/flatpak-cli-transaction.c | 24 ------------------------ app/flatpak-cli-transaction.h | 5 ----- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/app/flatpak-builtins-install.c b/app/flatpak-builtins-install.c index 75f9b5af..79c424c4 100644 --- a/app/flatpak-builtins-install.c +++ b/app/flatpak-builtins-install.c @@ -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)) diff --git a/app/flatpak-cli-transaction.c b/app/flatpak-cli-transaction.c index 4bcf14d4..9933dc1a 100644 --- a/app/flatpak-cli-transaction.c +++ b/app/flatpak-cli-transaction.c @@ -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, diff --git a/app/flatpak-cli-transaction.h b/app/flatpak-cli-transaction.h index 4c79bee3..009d01e9 100644 --- a/app/flatpak-cli-transaction.h +++ b/app/flatpak-cli-transaction.h @@ -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,