diff options
| author |   Pavlos Ratis <dastergon@gentoo.org> | 2014-12-03 14:49:45 +0200 |
|---|---|---|
| committer | Pavlos Ratis <dastergon@gentoo.org> | 2014-12-03 14:49:45 +0200 |
| commit | 7e372d0da863d0b5ca89291801d3ed775a837080 (patch) | |
| tree | 27ab37006150dde97416abf3d896225633fe2c98 /gkeys | |
| parent | Merge pull request #33 from gentoo/dol-sen-PR (diff) | |
| download | gentoo-keys-7e372d0da863d0b5ca89291801d3ed775a837080.tar.gz gentoo-keys-7e372d0da863d0b5ca89291801d3ed775a837080.tar.bz2 gentoo-keys-7e372d0da863d0b5ca89291801d3ed775a837080.zip | |
support local/global config
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: |