[MAIN]
# keysdir: base directory to store the binary keyrings and data
-keysdir: /home/brian/gpg-test
+keys-dir: /var/lib/gentoo
+
# devkeydir: the directory where the gentoo developer keys
# will be stored.
-devkeydir: %(keysdir)s/devs
+dev-keydir: %(keysdir)s/devs
+
# releaskeydir: the directory where the official release media keys
# will be stored.
-releasekeydir: %(keysdir)s/release
+release-keydir: %(keysdir)s/release
+
+
+# overlayskeydir: the directory where the overlay keys
+# will be stored.
+overlays-keydir: %(keysdir)s/overlays
+
# knownkeysfile: txt file to hold a cache of the
# installed (name, keyid, fingerprint) keys
-knownkeysfile: %(keysdir)s/knownkeys
+known-keysfile: %(keysdir)s/knownkeys
+
# releaseseedfile: txt file of one tuple of (name, keyid, fingerprint)
# entry per line
-releaseseedfile: /etc/gentoo-keys/release.seeds
+release-seedfile: /etc/gentoo-keys/release.seeds
+
# devseedfile: txt file of one tuple of (name, keyid, fingerprint)
# entry per line
-devseedfile: /etc/gentoo-keys/developer.seeds
+dev-seedfile: /etc/gentoo-keys/developer.seeds
+
""" Configuration superclass which holds our gentoo-keys
config settings for pygpg """
- def __init__ (self, config=None, root=None):
+ def __init__ (self, config=None, root=None, read_configfile=False):
""" Class initialiser """
GPGConfig.__init__(self)
self.defaults['configdir'] = path([self.root, EPREFIX, '/etc/gentoo-keys'])
self.defaults['config'] = '%(configdir)s/gkeys.conf'
self.configparser = None
-
- # read our config file overrides
- self.read_config()
+ if read_configfile:
+ self.read_config()
def _add_gkey_defaults(self):
- self.defaults['keysdir'] = path([self.root, EPREFIX, '/var/gentoo/gkeys'])
- self.defaults['devkeydir'] = '%(keysdir)s/devs'
- self.defaults['releasekeydir'] = '%(keysdir)s/release'
- self.defaults['knownkeysfile'] = '%(keysdir)s/knownkeys'
- self.fedualts['releaseseedfile'] = '%(configdir)s/release.seeds'
- self.fedualts['devseedfile'] = '%(configdir)s/developer.seeds'
+ self.defaults['key-sdir'] = path([self.root, EPREFIX, '/var/gentoo/gkeys'])
+ self.defaults['dev-keydir'] = '%(keysdir)s/devs'
+ self.defaults['release-keydir'] = '%(keysdir)s/release'
+ self.defaults['overlays-keydir'] = '%(keysdir)s/overlays'
+ self.defaults['known-keysfile'] = '%(keysdir)s/knownkeys'
+ self.defaults['release-seedfile'] = '%(configdir)s/release.seeds'
+ self.defaults['dev-seedfile'] = '%(configdir)s/developer.seeds'
self.configparser.add_section('MAIN')
self.configparser.read(defaults['config'])
+
+ def get_key(self, key):
+ return self._get_(key)
+
+
def _get_(self, key):
if self.configparser and self.configparser.has_option('MAIN', key):
return self.configparser.get('MAIN', key)
- else:
- super('GKeysConfig', self)._get_(key)
+ elif key in self.options:
+ return self.options[key]
+ elif key in self.defaults:
+ return self.defaults[key]
+ logger.error("GKeysConfig: _get_(); didn't find :", key)
+ return None
class GKEY(namedtuple('GKEY', ['name', 'keyid', 'longkeyid',