From bd992715dc3c778cf49eb8a5216e72e8ba15d489 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 30 Jun 2020 12:34:19 +0200 Subject: [PATCH] transactions: Request tokens after detecting which ops are no-ops --- common/flatpak-transaction.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c index efc9cb61..63db4227 100644 --- a/common/flatpak-transaction.c +++ b/common/flatpak-transaction.c @@ -3979,10 +3979,6 @@ flatpak_transaction_real_run (FlatpakTransaction *self, if (!resolve_all_ops (self, cancellable, error)) return FALSE; - /* Ensure we have all required tokens */ - if (!request_required_tokens (self, NULL, cancellable, error)) - return FALSE; - sort_ops (self); /* Ensure the operation kind is normalized and not no-op */ @@ -4020,6 +4016,10 @@ flatpak_transaction_real_run (FlatpakTransaction *self, } } + /* Ensure we have all required tokens */ + if (!request_required_tokens (self, NULL, cancellable, error)) + return FALSE; + g_signal_emit (self, signals[READY], 0, &ready_res); if (!ready_res)