diff options
| author | Jeremy Whiting <jeremy.whiting@collabora.com> | 2013-09-05 12:50:36 -0600 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-09-29 14:49:47 -0400 |
| commit | 7f9eefb62d2b5a977289fa5a5a1d34755f597679 (patch) | |
| tree | 066943d31be8969ed92bda7dbd860f76738462d1 /src/ostree/ot-admin-builtin-upgrade.c | |
| parent | b0645815770e0721d8915f924903d3a0a51e3964 (diff) | |
| download | ostree-7f9eefb62d2b5a977289fa5a5a1d34755f597679.tar.gz | |
pull: Verify commits with gpg signatures from detached metadata
This uses gpgv for verification against DATADIR/ostree/pubring.gpg by
default. The keyring can be overridden by specifying OSTREE_GPG_HOME.
Add a unit test for commit signing with gpg key and verifying on pull;
to implement this we ship a test GPG key generated with no password
for Ostree Tester <test@test.com>.
Change all of the existing tests to disable GPG verification.
Diffstat (limited to 'src/ostree/ot-admin-builtin-upgrade.c')
| -rw-r--r-- | src/ostree/ot-admin-builtin-upgrade.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c index 27925c58..73b1bf57 100644 --- a/src/ostree/ot-admin-builtin-upgrade.c +++ b/src/ostree/ot-admin-builtin-upgrade.c @@ -104,11 +104,12 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel if (origin_remote) { + OstreeRepoPullFlags pullflags = 0; char *refs_to_fetch[] = { origin_ref, NULL }; g_print ("Fetching remote %s ref %s\n", origin_remote, origin_ref); - if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, OSTREE_REPO_PULL_FLAGS_NONE, + if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, pullflags, cancellable, error)) goto out; } |