mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-01 03:21:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Drop useless options from flatpak info

Browse Source 
The --app and --runtime options are not really useful
for flatpak info, since you need to specify a full ID
anyway, and it is highly unlikely that you will have
ID clashes between apps and runtimes. Also, the options
are documented in a confusing way.
This commit is contained in:
Matthias Clasen
2017-04-12 14:34:41 -04:00
committed by Alexander Larsson
parent 723512b9a7
commit 581e6f6df5
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/flatpak-builtins-info.c
View File

@@ -35,8 +35,6 @@
static gboolean opt_user;
static gboolean opt_system;
static gboolean opt_runtime;
static gboolean opt_app;
static gboolean opt_show_ref;
static gboolean opt_show_commit;
static gboolean opt_show_origin;
@@ -48,8 +46,6 @@ static GOptionEntry options[] = {
{ "user", 0, 0, G_OPTION_ARG_NONE, &opt_user, N_("Show user installations"), NULL },
{ "system", 0, 0, G_OPTION_ARG_NONE, &opt_system, N_("Show system-wide installations"), NULL },
{ "installation", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_installations, N_("Show specific system-wide installations"), NULL },
{ "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 },
{ "show-ref", 'r', 0, G_OPTION_ARG_NONE, &opt_show_ref, N_("Show ref"), NULL },
{ "show-commit", 'c', 0, G_OPTION_ARG_NONE, &opt_show_commit, N_("Show commit"), NULL },
{ "show-origin", 'o', 0, G_OPTION_ARG_NONE, &opt_show_origin, N_("Show origin"), NULL },
@@ -97,7 +93,7 @@ flatpak_builtin_info (int argc, char **argv, GCancellable *cancellable, GError *
if (argc > 3)
return usage_error (context, _("Too many arguments"), error);
kinds = flatpak_kinds_from_bools (opt_app, opt_runtime);
kinds = FLATPAK_KINDS_APP | FLATPAK_KINDS_RUNTIME;
if (!opt_user && !opt_system && opt_installations == NULL)
search_all = TRUE;
@@ -160,7 +156,7 @@ flatpak_complete_info (FlatpakCompletion *completion)
if (!flatpak_option_context_parse (context, options, &completion->argc, &completion->argv, FLATPAK_BUILTIN_FLAG_NO_DIR, NULL, NULL, NULL))
return FALSE;
kinds = flatpak_kinds_from_bools (opt_app, opt_runtime);
kinds = FLATPAK_KINDS_APP | FLATPAK_KINDS_RUNTIME;
if (!opt_user && !opt_system && opt_installations == NULL)
search_all = TRUE;

20
doc/flatpak-info.xml
View File

@@ -48,10 +48,6 @@
are queried. Use the --user, --system or --installation
options to change this.
</para>
<para>
By default this queries the installed apps and runtimes, but you can
limit this by using the --app or --runtime option.
</para>
</refsect1>
@@ -97,22 +93,6 @@
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--app</option></term>
<listitem><para>
Query for applications.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--runtime</option></term>
<listitem><para>
Query for runtimes.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--arch=ARCH</option></term>