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

dir: Immediately return if getting remote state is cancelled

Browse Source 
Immediately return the error instead of saving the error and
continuing on an optional codepath if _flatpak_dir_get_remote_state
is cancelled.
This commit is contained in:
Umang Jain
2019-11-01 14:25:13 +05:30
committed by Alexander Larsson
parent 4c3e59cd12
commit 142a7fd855
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/flatpak-dir.c
View File

@@ -11189,7 +11189,7 @@ _flatpak_dir_get_remote_state (FlatpakDir *self,
}
else
{
if (optional)
if (optional && !g_cancellable_is_cancelled (cancellable))
{
state->summary_fetch_error = g_steal_pointer (&local_error);
g_debug ("Failed to download optional summary");
@@ -11218,7 +11218,7 @@ _flatpak_dir_get_remote_state (FlatpakDir *self,
if (!_flatpak_dir_fetch_remote_state_metadata_branch (self, state, only_cached, cancellable, &local_error) &&
!g_error_matches (local_error, FLATPAK_ERROR, FLATPAK_ERROR_DOWNGRADE))
{
if (optional)
if (optional && !g_cancellable_is_cancelled (cancellable))
{
/* This happens for instance in the case where a p2p remote is invalid (wrong signature)
and we should just silently fail to update to it. */