mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-07 06:21:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix error pileup

Browse Source 
All the error handling in the for loop is meant to
use local_error, not error.

Closes: #1936
Approved by: mwleeds
This commit is contained in:
Matthias Clasen
2018-07-31 17:22:57 -04:00
committed by Atomic Bot
parent 6b2fa94351
commit 9783472eaa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/flatpak-transaction.c
View File

@@ -2362,7 +2362,7 @@ flatpak_transaction_run (FlatpakTransaction *self,
g_assert (op->resolved_commit != NULL); /* We resolved this before */
if (op->resolved_metakey && !flatpak_check_required_version (op->ref, op->resolved_metakey, error))
if (op->resolved_metakey && !flatpak_check_required_version (op->ref, op->resolved_metakey, &local_error))
res = FALSE;
else
res = flatpak_dir_install (priv->dir,
@@ -2401,7 +2401,7 @@ flatpak_transaction_run (FlatpakTransaction *self,
emit_new_op (self, op, progress);
if (op->resolved_metakey && !flatpak_check_required_version (op->ref, op->resolved_metakey, error))
if (op->resolved_metakey && !flatpak_check_required_version (op->ref, op->resolved_metakey, &local_error))
res = FALSE;
else
res = flatpak_dir_update (priv->dir,
@@ -2443,7 +2443,7 @@ flatpak_transaction_run (FlatpakTransaction *self,
{
g_autoptr(FlatpakTransactionProgress) progress = flatpak_transaction_progress_new ();
emit_new_op (self, op, progress);
if (op->resolved_metakey && !flatpak_check_required_version (op->ref, op->resolved_metakey, error))
if (op->resolved_metakey && !flatpak_check_required_version (op->ref, op->resolved_metakey, &local_error))
res = FALSE;
else
res = flatpak_dir_install_bundle (priv->dir, op->bundle,