flatpak-builtins-list.c (flatpak-1.15.2.tar.xz) | : | flatpak-builtins-list.c (flatpak-1.15.3.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 157 | skipping to change at line 157 | |||
g_hash_table_add (ref_hash, (char *)flatpak_decomposed_get_ref (ref)); | g_hash_table_add (ref_hash, (char *)flatpak_decomposed_get_ref (ref)); | |||
} | } | |||
for (j = 0; j < dir_refs->len; j++) | for (j = 0; j < dir_refs->len; j++) | |||
{ | { | |||
FlatpakDecomposed *ref = g_ptr_array_index (dir_refs, j); | FlatpakDecomposed *ref = g_ptr_array_index (dir_refs, j); | |||
const char *partial_ref; | const char *partial_ref; | |||
const char *repo = NULL; | const char *repo = NULL; | |||
g_autoptr(FlatpakDeploy) deploy = NULL; | g_autoptr(FlatpakDeploy) deploy = NULL; | |||
g_autoptr(GBytes) deploy_data = NULL; | g_autoptr(GBytes) deploy_data = NULL; | |||
g_autoptr(GError) local_error = NULL; | ||||
const char *active; | const char *active; | |||
const char *alt_id; | const char *alt_id; | |||
const char *eol; | const char *eol; | |||
const char *eol_rebase; | const char *eol_rebase; | |||
const char *appdata_name; | const char *appdata_name; | |||
const char *appdata_summary; | const char *appdata_summary; | |||
const char *appdata_version; | const char *appdata_version; | |||
const char *runtime; | const char *runtime; | |||
g_autofree char *latest = NULL; | g_autofree char *latest = NULL; | |||
g_autofree const char **subpaths = NULL; | g_autofree const char **subpaths = NULL; | |||
int k; | int k; | |||
partial_ref = flatpak_decomposed_get_pref (ref); | partial_ref = flatpak_decomposed_get_pref (ref); | |||
if (arch != NULL && !flatpak_decomposed_is_arch (ref, arch)) | if (arch != NULL && !flatpak_decomposed_is_arch (ref, arch)) | |||
continue; | continue; | |||
deploy = flatpak_dir_load_deployed (dir, ref, NULL, cancellable, NULL) | deploy = flatpak_dir_load_deployed (dir, ref, NULL, cancellable, &loca | |||
; | l_error); | |||
deploy_data = flatpak_deploy_get_deploy_data (deploy, FLATPAK_DEPLOY_V | ||||
ERSION_CURRENT, cancellable, NULL); | if (deploy == NULL) | |||
{ | ||||
g_warning (_("Unable to load details of %s: %s"), | ||||
partial_ref, local_error->message); | ||||
g_clear_error (&local_error); | ||||
continue; | ||||
} | ||||
deploy_data = flatpak_deploy_get_deploy_data (deploy, FLATPAK_DEPLOY_V | ||||
ERSION_CURRENT, cancellable, &local_error); | ||||
if (deploy_data == NULL) | if (deploy_data == NULL) | |||
continue; | { | |||
g_warning (_("Unable to inspect current version of %s: %s"), | ||||
partial_ref, local_error->message); | ||||
g_clear_error (&local_error); | ||||
continue; | ||||
} | ||||
runtime = flatpak_deploy_data_get_runtime (deploy_data); | runtime = flatpak_deploy_data_get_runtime (deploy_data); | |||
if (app_runtime) | if (app_runtime) | |||
{ | { | |||
if (runtime) | if (runtime) | |||
{ | { | |||
g_auto(GStrv) pref = g_strsplit (runtime, "/", 3); | g_auto(GStrv) pref = g_strsplit (runtime, "/", 3); | |||
if ((match_id && pref[0] && strcmp (pref[0], match_id) != 0) | | | if ((match_id && pref[0] && strcmp (pref[0], match_id) != 0) | | | |||
(match_arch && pref[1] && strcmp (pref[1], match_arch) != 0) || | (match_arch && pref[1] && strcmp (pref[1], match_arch) != 0) || | |||
End of changes. 3 change blocks. | ||||
5 lines changed or deleted | 21 lines changed or added |