mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-24 16:57:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to --gpg-key= as it never worked

Browse Source
This commit is contained in:
Alexander Larsson
2016-05-11 15:39:11 +02:00
parent edcf485dde
commit fcf137f25d
3 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/flatpak-builtins-add-remote.c
View File

@@ -66,7 +66,6 @@ static GOptionEntry common_options[] = {
{ "prio", 0, 0, G_OPTION_ARG_INT, &opt_prio, "Set priority (default 1, higher is more prioritized)", NULL },
{ "title", 0, 0, G_OPTION_ARG_STRING, &opt_title, "A nice name to use for this remote", "TITLE" },
{ "gpg-import", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &opt_gpg_import, "Import GPG key from FILE (- for stdin)", "FILE" },
{ "gpg-key", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_gpg_import, "Optionally only import the named key(s) from the keyring files", "KEY" },
{ "disable", 0, 0, G_OPTION_ARG_NONE, &opt_disable, "Disable the remote", },
{ NULL }
};

12
doc/flatpak-remote-add.xml
View File

@@ -140,17 +140,7 @@
<listitem><para>
Import gpg keys from the specified keyring file as
trusted for the new remote. If the file is - the
keyring is read from standard input. The set of keys
imported from the keyring can optionally be limited by
using --gpg-key.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--gpg-key=KEY</option></term>
<listitem><para>
Only import the named keys from the specified gpg keyrings.
keyring is read from standard input.
</para></listitem>
</varlistentry>

12
doc/flatpak-remote-modify.xml
View File

@@ -156,17 +156,7 @@
<listitem><para>
Import gpg keys from the specified keyring file as
trusted for the new remote. If the file is - the
keyring is read from standard input. The set of keys
imported from the keyring can optionally be limited by
using --gpg-key.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--gpg-key=KEY</option></term>
<listitem><para>
Only import the named keys from the specified gpg keyrings.
keyring is read from standard input.
</para></listitem>
</varlistentry>