commit: 7e372d0da863d0b5ca89291801d3ed775a837080
Author: Pavlos Ratis <dastergon <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 3 12:49:45 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Dec 3 12:49:45 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=7e372d0d
support local/global config
---
gkeys/config.py | 8 ++++++--
1 file 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:
