From 5c0eef7bdecdcd77aea09e1d2d983e15485a08f4 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 11 Aug 2017 11:16:00 +0100 Subject: [PATCH] remote-add: Verify that GPG is enabled if collections are Emit an error message if a collection ID is specified but GPG is not enabled, since pulling using collection IDs requires GPG. Signed-off-by: Philip Withnall --- app/flatpak-builtins-add-remote.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/flatpak-builtins-add-remote.c b/app/flatpak-builtins-add-remote.c index 22e72e06..0cfb1b30 100644 --- a/app/flatpak-builtins-add-remote.c +++ b/app/flatpak-builtins-add-remote.c @@ -330,6 +330,10 @@ flatpak_builtin_add_remote (int argc, char **argv, if (opt_collection_id != NULL && !ostree_validate_collection_id (opt_collection_id, &local_error)) return flatpak_fail (error, _("‘%s’ is not a valid collection ID: %s"), opt_collection_id, local_error->message); + + if (opt_collection_id != NULL && + (opt_no_gpg_verify || opt_gpg_import == NULL || opt_gpg_import[0] == NULL)) + return flatpak_fail (error, _("GPG verification is required if collections are enabled")); #endif /* FLATPAK_ENABLE_P2P */ remote_name = argv[1];