diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2014-12-30 14:27:04 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2014-12-31 18:39:51 -0800 |
| commit | d97ffd3d5aab2429c5256448b7f8c9571791490c (patch) | |
| tree | 00caaf4aabf0ca09626602d1877279afd899878d /gkeys | |
| parent | gkeys/config.py: Make it possible to read more than one config file (diff) | |
| download | gentoo-keys-d97ffd3d5aab2429c5256448b7f8c9571791490c.tar.gz gentoo-keys-d97ffd3d5aab2429c5256448b7f8c9571791490c.tar.bz2 gentoo-keys-d97ffd3d5aab2429c5256448b7f8c9571791490c.zip | |
gkeys/config.py: Move default config file setting to a function
Make homedir initialzation part of the defaults options for consistency.
Move the default user config file into a ~/.gkeys/ sub-directory
Diffstat (limited to 'gkeys')
| -rw-r--r-- | gkeys/gkeys/config.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gkeys/gkeys/config.py b/gkeys/gkeys/config.py index 5d3923f..fdc1cee 100644 --- a/gkeys/gkeys/config.py +++ b/gkeys/gkeys/config.py @@ -48,18 +48,21 @@ class GKeysConfig(GPGConfig): self.defaults['config'] = config self.defaults['configdir'] = os.path.dirname(config) else: - self.homedir = os.path.expanduser('~') - self.defaults['configdir'] = self.homedir - self.defaults['config']= os.path.join(self.homedir, '.gkeys.conf') - if not os.path.exists(self.defaults['config']): - self.defaults['configdir'] = path([self.root, EPREFIX, '/etc/gkeys']) - self.defaults['config'] = '%(configdir)s/gkeys.conf' + self._set_default_config() self.configparser = None self._add_gkey_defaults() if read_configfile: self.read_config() + def _set_default_config(self): + self.defaults['homedir'] = os.path.join(os.path.expanduser('~'), '.gkeys') + self.defaults['configdir'] = self.defaults['homedir'] + self.defaults['config']= os.path.join(self.defaults['homedir'], 'gkeys.conf') + if not os.path.exists(self.defaults['config']): + self.defaults['configdir'] = path([self.root, EPREFIX, '/etc/gkeys']) + self.defaults['config'] = '%(configdir)s/gkeys.conf' + def _add_gkey_defaults(self): self.defaults['gkeysdir'] = path([self.root, EPREFIX, '/var/lib/gentoo/gkeys']) self.defaults['keyring'] = '%(gkeysdir)s/keyring' |