From 131ba30ea932cb0219e8a204b0fc4f84bfe78aa7 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 25 Apr 2019 11:08:56 +0200 Subject: [PATCH] cli: Drop unnecessary "something failed" message with --noninteractive We reported the error already, just report the exit status. Closes: #2858 Approved by: alexlarsson --- app/flatpak-quiet-transaction.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/flatpak-quiet-transaction.c b/app/flatpak-quiet-transaction.c index f85081ba..9d678f19 100644 --- a/app/flatpak-quiet-transaction.c +++ b/app/flatpak-quiet-transaction.c @@ -145,7 +145,8 @@ operation_error (FlatpakTransaction *transaction, else msg = g_strdup (error->message); - g_printerr (_("Failed to %s %s: %s\n"), + g_printerr (_("%s Failed to %s %s: %s\n"), + non_fatal ? _("Warning:") : _("Error:"), op_type_to_string (op_type), flatpak_ref_get_name (rref), msg); @@ -183,7 +184,8 @@ end_of_lifed_with_rebase (FlatpakTransaction *transaction, if (!flatpak_transaction_add_uninstall (transaction, ref, &error) || !flatpak_transaction_add_rebase (transaction, remote, rebased_to_ref, NULL, previous_ids, &error)) { - g_printerr (_("Failed to rebase %s to %s: %s\n"), flatpak_ref_get_name (rref), rebased_to_ref, error->message); + g_printerr (_("Failed to rebase %s to %s: %s\n"), + flatpak_ref_get_name (rref), rebased_to_ref, error->message); self->got_error = TRUE; return FALSE; } @@ -207,7 +209,7 @@ flatpak_quiet_transaction_run (FlatpakTransaction *transaction, if (self->got_error) { g_clear_error (error); - return flatpak_fail (error, _("There were one or more errors")); + return FALSE; /* Don't report on stderr, we already reported */ } if (!res)