flatpak-oci-registry.c (flatpak-1.15.1.tar.xz) | : | flatpak-oci-registry.c (flatpak-1.15.2.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 1073 | skipping to change at line 1073 | |||
{ | { | |||
error_detail = object_find_error_string (json_array_get_el ement (array, i)); | error_detail = object_find_error_string (json_array_get_el ement (array, i)); | |||
if (error_detail != 0) | if (error_detail != 0) | |||
break; | break; | |||
} | } | |||
} | } | |||
} | } | |||
} | } | |||
if (error_detail == NULL) | if (error_detail == NULL) | |||
g_debug ("Unhandled error body format: %s", body_data); | g_info ("Unhandled error body format: %s", body_data); | |||
if (http_status == 401 /* UNAUTHORIZED */) | if (http_status == 401 /* UNAUTHORIZED */) | |||
{ | { | |||
if (error_detail) | if (error_detail) | |||
flatpak_fail_error (error, FLATPAK_ERROR_NOT_AUTHORIZED, _("Authoriz ation failed: %s"), error_detail); | flatpak_fail_error (error, FLATPAK_ERROR_NOT_AUTHORIZED, _("Authoriz ation failed: %s"), error_detail); | |||
else | else | |||
flatpak_fail_error (error, FLATPAK_ERROR_NOT_AUTHORIZED, _("Authoriz ation failed")); | flatpak_fail_error (error, FLATPAK_ERROR_NOT_AUTHORIZED, _("Authoriz ation failed")); | |||
return NULL; | return NULL; | |||
} | } | |||
skipping to change at line 2982 | skipping to change at line 2982 | |||
if (ref == NULL) | if (ref == NULL) | |||
continue; | continue; | |||
metadata_contents = get_image_metadata (image, "org.flatpak.metadata"); | metadata_contents = get_image_metadata (image, "org.flatpak.metadata"); | |||
if (metadata_contents == NULL && !g_str_has_prefix (ref, "appstream/")) | if (metadata_contents == NULL && !g_str_has_prefix (ref, "appstream/")) | |||
continue; /* Not a flatpak, skip */ | continue; /* Not a flatpak, skip */ | |||
if (!g_str_has_prefix (image->digest, "sha256:")) | if (!g_str_has_prefix (image->digest, "sha256:")) | |||
{ | { | |||
g_debug ("Ignoring digest type %s", image->digest); | g_info ("Ignoring digest type %s", image->digest); | |||
continue; | continue; | |||
} | } | |||
fake_commit = image->digest + strlen ("sha256:"); | fake_commit = image->digest + strlen ("sha256:"); | |||
installed_size_str = get_image_metadata (image, "org.flatpak.installed-siz e"); | installed_size_str = get_image_metadata (image, "org.flatpak.installed-siz e"); | |||
if (installed_size_str) | if (installed_size_str) | |||
installed_size = g_ascii_strtoull (installed_size_str, NULL, 10); | installed_size = g_ascii_strtoull (installed_size_str, NULL, 10); | |||
download_size_str = get_image_metadata (image, "org.flatpak.download-size" ); | download_size_str = get_image_metadata (image, "org.flatpak.download-size" ); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |