[gentoo-commits] proj/gentoo-keys:master commit in: etc/, gkeys/

[Brian Dolbec]

commit:     11aa646eac0397f32e7617961d4f339f33e52fb8
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  1 00:54:25 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Mar  1 00:54:25 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=11aa646e

gkeys/actions.py: Add listseedfiles() and fix -S option support.

---
 etc/gkeys.conf   |  9 +++++++--
 gkeys/actions.py | 25 +++++++++++++++++++------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/etc/gkeys.conf b/etc/gkeys.conf
index 46d45aa..2497c30 100644
--- a/etc/gkeys.conf
+++ b/etc/gkeys.conf
@@ -31,14 +31,19 @@ overlays-keydir: %(keysdir)s/overlays
 known-keysfile:  %(keysdir)s/knownkeys
 
 
+# seedsdir: base directory for all seed files
+# used when searching all seed files.
+seedsdir: %(keysdir)s/seeds
+
+
 # releaseseedfile: txt file of one tuple of (name, keyid, fingerprint)
 # entry per line
-release-seedfile: /etc/gentoo-keys/release.seeds
+release-seedfile: %(seedsdir)s/release.seeds
 
 
 # devseedfile: txt file of one tuple of (name, keyid, fingerprint)
 # entry per line
-dev-seedfile: /etc/gentoo-keys/developer.seeds
+dev-seedfile: %(seedsdir)s/developer.seeds
 
 
 # logfile directory

diff --git a/gkeys/actions.py b/gkeys/actions.py
index 77ac212..2e2b1b7 100644
--- a/gkeys/actions.py
+++ b/gkeys/actions.py
@@ -12,14 +12,17 @@
 
 from __future__ import print_function
 
+import os
+
 
 from gkeys.seedhandler import SeedHandler
 from gkeys.lib import GkeysGPG
 from gkeys.seed import Seeds
 
 
-Avialable_Actions = ['listseed', 'addseed', 'removeseed', 'moveseed', 'listkey',
-            'addkey', 'removekey', 'movekey', 'installed']
+Avialable_Actions = ['listseed', 'addseed', 'removeseed', 'moveseed',
+            'listseedfiles', 'listkey', 'addkey', 'removekey', 'movekey',
+            'installed']
 
 
 class Actions(object):
@@ -32,13 +35,17 @@ class Actions(object):
         self.seeds = None
 
 
-    def load_seeds(self, filename):
-        if not filename:
+    def load_seeds(self, seeds=None ,seedfile=None):
+        if not seeds and not seedfile:
             self.logger.error("ACTIONS: load_seeds; no filename to load: "
             "setting = %s.  Please use the -s option to indicate: which seed "
             "file to use." % filename)
             return None
-        filepath = self.config.get_key(filename + "-seedfile")
+        if seeds:
+            filepath = self.config.get_key(filename + "-seedfile")
+        elif seedfile:
+            filepath = os.path.join(self.config.get_key('seedsdir'),
+                                    '%s.seeds' % seedfile)
         self.logger.debug("ACTIONS: load_seeds; seeds filepath to load: "
             "%s" % filepath)
         seeds = Seeds()
@@ -52,7 +59,7 @@ class Actions(object):
         kwargs = handler.build_gkeydict(args)
         self.logger.debug("ACTIONS: listseed; kwargs: %s" % str(kwargs))
         if not self.seeds:
-            self.seeds = self.load_seeds(args.seeds)
+            self.seeds = self.load_seeds(args.seeds, args.seedfile)
         if self.seeds:
             results = self.seeds.list(**kwargs)
             return results
@@ -275,3 +282,9 @@ class Actions(object):
         '''
         pass
 
+
+    def listseedfiles(self, args):
+        seedsdir = self.config.get_key('seedsdir')
+        files = os.listdir(seedsdir)
+        return {"Seed files found at path: %s\n   %s"
+            % (seedsdir, "\n   ".join(files)): True}