From f564b2abf75ae01ea95b6995de517c91fb0462b7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 24 Aug 2017 08:47:22 -0400 Subject: gpg: add an argument for the import directory This is hidden because it is only meant for use by the tests. --- lib/spack/spack/cmd/gpg.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/cmd/gpg.py b/lib/spack/spack/cmd/gpg.py index 1f46033813..3ec6094cac 100644 --- a/lib/spack/spack/cmd/gpg.py +++ b/lib/spack/spack/cmd/gpg.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack.util.gpg import Gpg +import argparse import spack import os @@ -87,8 +88,9 @@ def setup_parser(subparser): list.set_defaults(func=gpg_list) init = subparsers.add_parser('init') + init.add_argument('--from', metavar='DIR', type=str, + dest='import_dir', help=argparse.SUPPRESS) init.set_defaults(func=gpg_init) - init.set_defaults(import_dir=spack.gpg_keys_path) export = subparsers.add_parser('export') export.add_argument('location', type=str, @@ -144,7 +146,11 @@ def gpg_trust(args): def gpg_init(args): - for root, _, filenames in os.walk(args.import_dir): + import_dir = args.import_dir + if import_dir is None: + import_dir = spack.gpg_keys_path + + for root, _, filenames in os.walk(import_dir): for filename in filenames: if not filename.endswith('.key'): continue -- cgit v1.2.3-70-g09d2