diff options
author | 2014-12-03 11:10:09 -0800 | |
---|---|---|
committer | 2014-12-03 11:10:09 -0800 | |
commit | 03f95d6131bc79956ed098496e041d6f20c1a7d8 (patch) | |
tree | 27ab37006150dde97416abf3d896225633fe2c98 /gkeys | |
parent | Merge pull request #33 from gentoo/dol-sen-PR (diff) | |
parent | support local/global config (diff) | |
download | gentoo-keys-03f95d6131bc79956ed098496e041d6f20c1a7d8.tar.gz gentoo-keys-03f95d6131bc79956ed098496e041d6f20c1a7d8.tar.bz2 gentoo-keys-03f95d6131bc79956ed098496e041d6f20c1a7d8.zip |
Merge pull request #34 from gentoo/local_conf
support user/global config in gkeys
Diffstat (limited to 'gkeys')
-rw-r--r-- | gkeys/config.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gkeys/config.py b/gkeys/config.py index ae6e68c..7cefe92 100644 --- a/gkeys/config.py +++ b/gkeys/config.py @@ -65,8 +65,12 @@ class GKeysConfig(GPGConfig): self.defaults['config'] = config self.defaults['configdir'] = os.path.dirname(config) else: - self.defaults['configdir'] = path([self.root, EPREFIX, '/etc/gkeys']) - self.defaults['config'] = '%(configdir)s/gkeys.conf' + homedir = os.path.expanduser('~') + self.defaults['configdir'] = homedir + self.defaults['config']= os.path.join(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.configparser = None self._add_gkey_defaults() if read_configfile: |