wip only show global keyrings when no remote supplied

Author: dbnicholson

src/libostree/ostree-repo.c

@@ -2355,6 +2355,7 @@ _ostree_repo_gpg_prepare_verifier (OstreeRepo         *self,
                                    const gchar        *remote_name,
                                    GFile              *keyringdir,
                                    GFile              *extra_keyring,
+                                   gboolean            add_global_keyrings,
                                    OstreeGpgVerifier **out_verifier,
                                    GCancellable       *cancellable,
                                    GError            **error);
@@ -2391,8 +2392,8 @@ ostree_repo_remote_get_gpg_keys (OstreeRepo          *self,
 {
 #ifndef OSTREE_DISABLE_GPGME
   g_autoptr(OstreeGpgVerifier) verifier = NULL;
-  if (!_ostree_repo_gpg_prepare_verifier (self, name, NULL, NULL, &verifier,
-                                          cancellable, error))
+  if (!_ostree_repo_gpg_prepare_verifier (self, name, NULL, NULL, (name == NULL),
+                                          &verifier, cancellable, error))
     return FALSE;
 
   g_autoptr(GPtrArray) gpg_keys = NULL;
@@ -2579,8 +2580,8 @@ ostree_repo_remote_update_gpg_keys (OstreeRepo     *self,
 {
 #ifndef OSTREE_DISABLE_GPGME
   g_autoptr(OstreeGpgVerifier) verifier = NULL;
-  if (!_ostree_repo_gpg_prepare_verifier (self, name, NULL, NULL, &verifier,
-                                          cancellable, error))
+  if (!_ostree_repo_gpg_prepare_verifier (self, name, NULL, NULL, (name == NULL),
+                                          &verifier, cancellable, error))
     return FALSE;
 
   g_autoptr(GPtrArray) gpg_keys = NULL;
@@ -5609,12 +5610,12 @@ _ostree_repo_gpg_prepare_verifier (OstreeRepo         *self,
                                    const gchar        *remote_name,
                                    GFile              *keyringdir,
                                    GFile              *extra_keyring,
+                                   gboolean            add_global_keyrings,
                                    OstreeGpgVerifier **out_verifier,
                                    GCancellable       *cancellable,
                                    GError            **error)
 {
   g_autoptr(OstreeGpgVerifier) verifier = _ostree_gpg_verifier_new ();
-  gboolean add_global_keyring_dir = TRUE;
 
   if (remote_name == OSTREE_ALL_REMOTES)
     {
@@ -5641,7 +5642,7 @@ _ostree_repo_gpg_prepare_verifier (OstreeRepo         *self,
       if (keyring_data != NULL)
         {
           _ostree_gpg_verifier_add_keyring_data (verifier, keyring_data, remote->keyring);
-          add_global_keyring_dir = FALSE;
+          add_global_keyrings = FALSE;
         }
 
       g_auto(GStrv) gpgkeypath_list = NULL;
@@ -5663,7 +5664,7 @@ _ostree_repo_gpg_prepare_verifier (OstreeRepo         *self,
         }
     }
 
-  if (add_global_keyring_dir)
+  if (add_global_keyrings)
     {
       /* Use the deprecated global keyring directory. */
       if (!_ostree_gpg_verifier_add_global_keyring_dir (verifier, cancellable, error))
@@ -5702,6 +5703,7 @@ _ostree_repo_gpg_verify_data_internal (OstreeRepo    *self,
                                           remote_name,
                                           keyringdir,
                                           extra_keyring,
+                                          TRUE,
                                           &verifier,
                                           cancellable,
                                           error))

src/ostree/ot-remote-builtin-list-gpg-keys.c

@@ -49,13 +49,13 @@ ot_remote_builtin_list_gpg_keys (int                       argc,
                                     invocation, &repo, cancellable, error))
     return FALSE;
 
-  if (argc < 2)
-    {
-      ot_util_usage_error (context, "NAME must be specified", error);
-      return FALSE;
-    }
+  /* if (argc < 2) */
+  /*   { */
+  /*     ot_util_usage_error (context, "NAME must be specified", error); */
+  /*     return FALSE; */
+  /*   } */
 
-  const char *remote_name = argv[1];
+  const char *remote_name = (argc > 1) ? argv[1] : NULL;
 
   g_autoptr(GPtrArray) keys = NULL;
   if (!ostree_repo_remote_get_gpg_keys (repo, remote_name, NULL, &keys,