mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-02 14:27:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

OCI: correctly handle locally present icons

Browse Source 
If the download URL for an icon was already cached locally, the HTTP
code returned FLATPAK_OCI_ERROR_NOT_CHANGED - this was treated as a real
error, and after downloading missing icons, all present icons were
deleted!

See https://bugzilla.redhat.com/show_bug.cgi?id=1683375

Closes: #3048
Approved by: alexlarsson

(cherry picked from commit a794c07e18)
(cherry picked from commit 767a9d5a43)

Closes: #3115
Approved by: alexlarsson
This commit is contained in:
Owen W. Taylor
2019-08-07 16:25:06 -04:00
committed by Atomic Bot
parent 11070054b4
commit 843fb75ebd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/flatpak-oci-registry.c
View File

@@ -2223,13 +2223,18 @@ add_icon_image (SoupSession *soup_session,
g_autoptr(SoupURI) base_uri = soup_uri_new (index_uri);
g_autoptr(SoupURI) icon_uri = soup_uri_new_with_base (base_uri, icon_data);
g_autofree char *icon_uri_s = soup_uri_to_string (icon_uri, FALSE);
g_autoptr(GError) local_error = NULL;
if (!flatpak_cache_http_uri (soup_session, icon_uri_s,
0 /* flags */,
icons_dfd, icon_path,
NULL, NULL,
cancellable, error))
return FALSE;
cancellable, &local_error) &&
!g_error_matches (local_error, FLATPAK_OCI_ERROR, FLATPAK_OCI_ERROR_NOT_CHANGED))
{
g_propagate_error (error, g_steal_pointer (&local_error));
return FALSE;
}
g_hash_table_replace (used_icons, g_steal_pointer (&icon_path), GUINT_TO_POINTER (1));