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

list: Don't list .Locale and .Debug by default (override with -a)

Browse Source
This commit is contained in:
Alexander Larsson
2017-05-30 17:41:01 +02:00
parent f616ada02b
commit f072d585b0
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/flatpak-builtins-list.c
View File

@@ -38,6 +38,7 @@ static gboolean opt_user;
static gboolean opt_system;
static gboolean opt_runtime;
static gboolean opt_app;
static gboolean opt_all;
static char **opt_installations;
static char *opt_arch;
@@ -49,6 +50,7 @@ static GOptionEntry options[] = {
{ "runtime", 0, 0, G_OPTION_ARG_NONE, &opt_runtime, N_("List installed runtimes"), NULL },
{ "app", 0, 0, G_OPTION_ARG_NONE, &opt_app, N_("List installed applications"), NULL },
{ "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, N_("Arch to show"), N_("ARCH") },
{ "all", 'a', 0, G_OPTION_ARG_NONE, &opt_all, N_("List all refs (including locale/debug)"), NULL },
{ NULL }
};
@@ -141,12 +143,20 @@ print_table_for_refs (gboolean print_apps, GPtrArray* refs_array, const char *ar
RefsData *refs_data = NULL;
FlatpakDir *dir = NULL;
g_auto(GStrv) dir_refs = NULL;
g_autoptr(GHashTable) ref_hash = g_hash_table_new (g_str_hash, g_str_equal);
int j;
refs_data = (RefsData *) g_ptr_array_index (refs_array, i);
dir = refs_data->dir;
dir_refs = join_strv (refs_data->app_refs, refs_data->runtime_refs);
for (j = 0; dir_refs[j] != NULL; j++)
{
char *ref = dir_refs[j];
char *partial_ref = strchr (ref, '/') + 1;
g_hash_table_insert (ref_hash, partial_ref, ref);
}
for (j = 0; dir_refs[j] != NULL; j++)
{
char *ref, *partial_ref;
@@ -172,6 +182,21 @@ print_table_for_refs (gboolean print_apps, GPtrArray* refs_array, const char *ar
if (deploy_data == NULL)
continue;
if (!opt_all && strcmp (parts[0], "runtime") == 0 &&
(g_str_has_suffix (parts[1], ".Locale") ||
g_str_has_suffix (parts[1], ".Debug")))
{
g_autofree char *prefix_partial_ref = NULL;
char *last_dot = strrchr (parts[1], '.');
*last_dot = 0;
prefix_partial_ref = g_strconcat (parts[1], "/", parts[2], "/", parts[3], NULL);
*last_dot = '.';
if (g_hash_table_lookup (ref_hash, prefix_partial_ref))
continue;
}
repo = flatpak_deploy_data_get_origin (deploy_data);
active = flatpak_deploy_data_get_commit (deploy_data);

9
doc/flatpak-list.xml
View File

@@ -128,6 +128,15 @@
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--all</option></term>
<term><option>-a</option></term>
<listitem><para>
List all installed runtimes, including locale and debug extensions. These are hidden by default.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-v</option></term>
<term><option>--verbose</option></term>