From 9783472eaa7b68d39ea25fa02e8e9f8c8ee547ea Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 31 Jul 2018 17:22:57 -0400 Subject: [PATCH] Fix error pileup All the error handling in the for loop is meant to use local_error, not error. Closes: #1936 Approved by: mwleeds --- common/flatpak-transaction.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c index 2566fe5b..3163d130 100644 --- a/common/flatpak-transaction.c +++ b/common/flatpak-transaction.c @@ -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,