commit: 46447ca907b194e916bb6628235de1961434a903 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Wed Dec 10 18:38:33 2014 +0000 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> CommitDate: Sat Dec 20 16:46:04 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=46447ca9
gkeys: Simplify seed file configs and url handling --- etc/gkeys.conf.sample | 20 ++++++++++---------- gkeys/config.py | 6 +++--- gkeys/seedhandler.py | 12 +++++------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/etc/gkeys.conf.sample b/etc/gkeys.conf.sample index 45424d3..4c6b2d0 100644 --- a/etc/gkeys.conf.sample +++ b/etc/gkeys.conf.sample @@ -49,14 +49,6 @@ seedsdir: %(gkeysdir)s/seeds logdir: /var/log/gkeys -[seeds] - -# *-seedfile: json txt file of name, keyid, fingerprint -# entry per line -gentoo: %(seedsdir)s/gentoo.seeds -gentoodevs: %(seedsdir)s/gentoodevs.seeds - - [permissions] # Permissions settings (octal) @@ -67,12 +59,20 @@ directories: 0o775 files: 0o007 +[seeds] + +# *-seedfile: json txt file of name, keyid, fingerprint +# entry per line +gentoo: %(seedsdir)s/gentoo.seeds +gentoodevs: %(seedsdir)s/gentoodevs.seeds + + [seedurls] # Use the filenames as the keys. # The will be paired to the seed file of the same name for fetching, updating -gentoo.seeds: https://api.gentoo.org/gentoo-keys/seeds/gentoo.seeds -gentoodevs.seeds: https://api.gentoo.org/gentoo-keys/seeds/gentoodevs.seeds +gentoo: https://api.gentoo.org/gentoo-keys/seeds/gentoo.seeds +gentoodevs: https://api.gentoo.org/gentoo-keys/seeds/gentoodevs.seeds # GKEY nick used for verification of seeds and other gkey files diff --git a/gkeys/config.py b/gkeys/config.py index 7cefe92..775ea1f 100644 --- a/gkeys/config.py +++ b/gkeys/config.py @@ -49,7 +49,7 @@ GKEY_FINGERPRINTS = \ Fingerprint: %(fingerprint)s ''' -MAPSEEDS = { 'dev' : 'developers.seeds', 'rel': 'release.seeds' } +MAPSEEDS = { 'dev' : 'gentoodevs.seeds', 'rel': 'gentoo.seeds' } class GKeysConfig(GPGConfig): @@ -96,8 +96,8 @@ class GKeysConfig(GPGConfig): # NOTE: files is umask mode in octal, directories is chmod mode in octal self.defaults['permissions'] = {'files': '0o002', 'directories': '0o775',} self.defaults['seedurls'] = { - 'gentoo.seeds': 'https://api.gentoo.org/gentoo-keys/seeds/gentoo.seeds', - 'gentoodevs.seeds': 'https://api.gentoo.org/gentoo-keys/seeds/gentoodevs.seeds', + 'gentoo': 'https://api.gentoo.org/gentoo-keys/seeds/gentoo.seeds', + 'gentoodevs': 'https://api.gentoo.org/gentoo-keys/seeds/gentoodevs.seeds', 'gkey': 'gkeys', } self.defaults['sign'] = { diff --git a/gkeys/seedhandler.py b/gkeys/seedhandler.py index 724af65..cc797b9 100644 --- a/gkeys/seedhandler.py +++ b/gkeys/seedhandler.py @@ -14,7 +14,7 @@ import os import re from json import load -from gkeys.config import GKEY, MAPSEEDS +from gkeys.config import GKEY from gkeys.seed import Seeds from gkeys.fileops import ensure_dirs @@ -127,17 +127,15 @@ class SeedHandler(object): messages = [] try: for seed in [seeds]: - seedurl = self.config.get_key('seedurls', MAPSEEDS[seed]) - seedpath = self.config.get_key('%s-seedfile' % seed) + seedurl = self.config.get_key('seedurls', seed) + seedpath = self.config.get_key('seeds', seed) if http_check.match(seedurl): urls.extend([(seedurl, seedpath)]) else: self.logger.info("Wrong seed file URLs... Switching to default URLs.") - urls.extend([(self.config['seedurls'][MAPSEEDS[seed]], seedpath)]) + urls.extend([(self.config['seedurls'][seed], seedpath)]) except KeyError: - for key, value in list(MAPSEEDS.items()): - seedpath = self.config.get_key('%s-seedfile' % key) - urls.extend([(self.config['seedurls'][value], seedpath)]) + pass succeeded = [] seedsdir = self.config.get_key('seedsdir') mode = int(self.config.get_key('permissions', 'directories'),0)
