flatpak-cli-transaction.c (flatpak-1.15.1.tar.xz) | : | flatpak-cli-transaction.c (flatpak-1.15.2.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 842 | skipping to change at line 842 | |||
{ | { | |||
/* Find apps which are using the ref as an extension directly or as an | /* Find apps which are using the ref as an extension directly or as an | |||
* extension of their runtime. | * extension of their runtime. | |||
*/ | */ | |||
apps = flatpak_dir_list_app_refs_with_runtime_extension (dir, | apps = flatpak_dir_list_app_refs_with_runtime_extension (dir, | |||
&self->runtime_ap p_map, | &self->runtime_ap p_map, | |||
&self->extension_ app_map, | &self->extension_ app_map, | |||
ref, NULL, &local _error); | ref, NULL, &local _error); | |||
if (apps == NULL) | if (apps == NULL) | |||
{ | { | |||
g_debug ("Unable to list apps using extension %s: %s\n", | g_info ("Unable to list apps using extension %s: %s\n", | |||
flatpak_decomposed_get_ref (ref), local_error->message); | flatpak_decomposed_get_ref (ref), local_error->message); | |||
return NULL; | return NULL; | |||
} | } | |||
} | } | |||
else | else | |||
{ | { | |||
/* Find any apps using the runtime directly */ | /* Find any apps using the runtime directly */ | |||
apps = flatpak_dir_list_app_refs_with_runtime (dir, &self->runtime_app_map , ref, | apps = flatpak_dir_list_app_refs_with_runtime (dir, &self->runtime_app_map , ref, | |||
NULL, &local_error); | NULL, &local_error); | |||
if (apps == NULL) | if (apps == NULL) | |||
{ | { | |||
g_debug ("Unable to find apps using runtime %s: %s\n", | g_info ("Unable to find apps using runtime %s: %s\n", | |||
flatpak_decomposed_get_ref (ref), local_error->message); | flatpak_decomposed_get_ref (ref), local_error->message); | |||
return NULL; | return NULL; | |||
} | } | |||
} | } | |||
/* Also check the current transaction since it's possible the EOL ref | /* Also check the current transaction since it's possible the EOL ref | |||
* and/or any app(s) that depend on it are not installed. It's also | * and/or any app(s) that depend on it are not installed. It's also | |||
* possible the current transaction updates one of the apps to a | * possible the current transaction updates one of the apps to a | |||
* newer runtime but we don't handle that yet | * newer runtime but we don't handle that yet | |||
* (https://github.com/flatpak/flatpak/issues/4832) | * (https://github.com/flatpak/flatpak/issues/4832) | |||
*/ | */ | |||
skipping to change at line 976 | skipping to change at line 976 | |||
g_print (_("Updating to rebased version\n")); | g_print (_("Updating to rebased version\n")); | |||
action = EOL_REBASE; | action = EOL_REBASE; | |||
} | } | |||
else | else | |||
action = EOL_NO_REBASE; | action = EOL_NO_REBASE; | |||
} | } | |||
} | } | |||
else | else | |||
{ | { | |||
g_debug ("%s is end-of-life, using action from parent ref", name); | g_info ("%s is end-of-life, using action from parent ref", name); | |||
} | } | |||
/* Cache for later comparison and reuse */ | /* Cache for later comparison and reuse */ | |||
g_hash_table_insert (self->eol_actions, flatpak_decomposed_ref (ref), GUINT_TO _POINTER (action)); | g_hash_table_insert (self->eol_actions, flatpak_decomposed_ref (ref), GUINT_TO _POINTER (action)); | |||
if (action == EOL_REBASE) | if (action == EOL_REBASE) | |||
{ | { | |||
g_autoptr(GError) error = NULL; | g_autoptr(GError) error = NULL; | |||
if (!flatpak_transaction_add_rebase (transaction, remote, rebased_to_ref, NULL, previous_ids, &error)) | if (!flatpak_transaction_add_rebase (transaction, remote, rebased_to_ref, NULL, previous_ids, &error)) | |||
End of changes. 3 change blocks. | ||||
5 lines changed or deleted | 5 lines changed or added |