mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-26 19:04:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

app: Tweak messages about dependent apps

Browse Source 
Use a "Info: " prefix which matches the message printed in
print_eol_info_message(). Also make the message accurately use either
the word "runtime" or "extension" as appropriate.
This commit is contained in:
Phaedrus Leeds
2022-03-31 12:40:19 -07:00
committed by Phaedrus Leeds
parent 65a4bb0a3d
commit bf99c266a8
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/flatpak-builtins-uninstall.c
View File

@@ -202,7 +202,7 @@ confirm_runtime_extension_removal (gboolean yes_opt,
ref_name = flatpak_decomposed_dup_id (ref);
ref_branch = flatpak_decomposed_get_branch (ref);
g_print (_("Applications using the runtime %s%s%s branch %s%s%s:\n"),
g_print (_("Info: applications using the extension %s%s%s branch %s%s%s:\n"),
on, ref_name, off, on, ref_branch, off);
g_print (" ");
for (guint i = 0; i < apps->len; i++)

17
app/flatpak-cli-transaction.c
View File

@@ -775,13 +775,17 @@ check_current_transaction_for_dependent_apps (GPtrArray *apps,
static GPtrArray *
find_reverse_dep_apps (FlatpakTransaction *transaction,
FlatpakDir *dir,
FlatpakDecomposed *ref)
FlatpakDecomposed *ref,
gboolean *out_is_extension)
{
FlatpakCliTransaction *self = FLATPAK_CLI_TRANSACTION (transaction);
g_autoptr(GPtrArray) apps = NULL;
g_autoptr(GError) local_error = NULL;
if (flatpak_dir_is_runtime_extension (dir, ref))
g_assert (out_is_extension);
*out_is_extension = flatpak_dir_is_runtime_extension (dir, ref);
if (*out_is_extension)
{
/* Find apps which are using the ref as an extension directly or as an
* extension of their runtime.
@@ -886,11 +890,16 @@ end_of_lifed_with_rebase (FlatpakTransaction *transaction,
if (flatpak_decomposed_is_runtime (ref) && !rebased_to_ref)
{
g_autoptr(GPtrArray) apps = find_reverse_dep_apps (transaction, dir, ref);
gboolean is_extension;
g_autoptr(GPtrArray) apps = find_reverse_dep_apps (transaction, dir, ref, &is_extension);
if (apps && apps->len > 0)
{
g_print (_("Applications using this runtime:\n"));
if (is_extension)
g_print (_("Info: applications using this extension:\n"));
else
g_print (_("Info: applications using this runtime:\n"));
g_print (" ");
for (guint i = 0; i < apps->len; i++)
{