packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

summary: add new command line arguments to sign the summary file 

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-04-29 11:43:17 +02:00
parent fee785a72e
commit 5f33133054
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/ostree-summary.xml
View File

@ -76,6 +76,23 @@ Boston, MA 02111-1307, USA.
Update the summary file. Update the summary file.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>--gpg-sign</option>=KEYID</term>
<listitem><para>
GPG Key ID to sign the delta with.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--gpg-homedir</option>=HOMEDIR</term>
<listitem><para>
GPG Homedir to use when looking for keyrings.
</para></listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect1> </refsect1>
</refentry> </refentry>

14
src/ostree/ot-builtin-summary.c
View File

@ -26,9 +26,13 @@
#include "otutil.h" #include "otutil.h"
static gboolean opt_update; static gboolean opt_update;
static char **opt_key_ids;
static char *opt_gpg_homedir;
static GOptionEntry options[] = { static GOptionEntry options[] = {
{ "update", 'u', 0, G_OPTION_ARG_NONE, &opt_update, "Update the summary", NULL }, { "update", 'u', 0, G_OPTION_ARG_NONE, &opt_update, "Update the summary", NULL },
{ "gpg-sign", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_key_ids, "GPG Key ID to sign the commit with", "KEY-ID"},
{ "gpg-homedir", 0, 0, G_OPTION_ARG_STRING, &opt_gpg_homedir, "GPG Homedir to use when looking for keyrings", "HOMEDIR"},
{ NULL } { NULL }
}; };
@ -51,6 +55,16 @@ ostree_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError
if (!ostree_repo_regenerate_summary (repo, NULL, cancellable, error)) if (!ostree_repo_regenerate_summary (repo, NULL, cancellable, error))
goto out; goto out;
if (opt_key_ids)
{
if (!ostree_repo_add_gpg_signature_summary (repo,
(const gchar **) opt_key_ids,
opt_gpg_homedir,
cancellable,
error))
goto out;
}
} }
else else
{ {