mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-27 09:08:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

cli: Drop unnecessary "something failed" message with --noninteractive

Browse Source 
We reported the error already, just report the exit status.

Closes: #2858
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2019-04-25 11:08:56 +02:00
committed by Atomic Bot
parent e3db7a4461
commit 131ba30ea9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/flatpak-quiet-transaction.c
View File

@@ -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)