| 1 |
commit: d97ffd3d5aab2429c5256448b7f8c9571791490c |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 30 22:27:04 2014 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 1 02:39:51 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=d97ffd3d |
| 7 |
|
| 8 |
gkeys/config.py: Move default config file setting to a function |
| 9 |
|
| 10 |
Make homedir initialzation part of the defaults options for consistency. |
| 11 |
Move the default user config file into a ~/.gkeys/ sub-directory |
| 12 |
|
| 13 |
--- |
| 14 |
gkeys/gkeys/config.py | 15 +++++++++------ |
| 15 |
1 file changed, 9 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gkeys/gkeys/config.py b/gkeys/gkeys/config.py |
| 18 |
index 5d3923f..fdc1cee 100644 |
| 19 |
--- a/gkeys/gkeys/config.py |
| 20 |
+++ b/gkeys/gkeys/config.py |
| 21 |
@@ -48,18 +48,21 @@ class GKeysConfig(GPGConfig): |
| 22 |
self.defaults['config'] = config |
| 23 |
self.defaults['configdir'] = os.path.dirname(config) |
| 24 |
else: |
| 25 |
- self.homedir = os.path.expanduser('~') |
| 26 |
- self.defaults['configdir'] = self.homedir |
| 27 |
- self.defaults['config']= os.path.join(self.homedir, '.gkeys.conf') |
| 28 |
- if not os.path.exists(self.defaults['config']): |
| 29 |
- self.defaults['configdir'] = path([self.root, EPREFIX, '/etc/gkeys']) |
| 30 |
- self.defaults['config'] = '%(configdir)s/gkeys.conf' |
| 31 |
+ self._set_default_config() |
| 32 |
self.configparser = None |
| 33 |
self._add_gkey_defaults() |
| 34 |
if read_configfile: |
| 35 |
self.read_config() |
| 36 |
|
| 37 |
|
| 38 |
+ def _set_default_config(self): |
| 39 |
+ self.defaults['homedir'] = os.path.join(os.path.expanduser('~'), '.gkeys') |
| 40 |
+ self.defaults['configdir'] = self.defaults['homedir'] |
| 41 |
+ self.defaults['config']= os.path.join(self.defaults['homedir'], 'gkeys.conf') |
| 42 |
+ if not os.path.exists(self.defaults['config']): |
| 43 |
+ self.defaults['configdir'] = path([self.root, EPREFIX, '/etc/gkeys']) |
| 44 |
+ self.defaults['config'] = '%(configdir)s/gkeys.conf' |
| 45 |
+ |
| 46 |
def _add_gkey_defaults(self): |
| 47 |
self.defaults['gkeysdir'] = path([self.root, EPREFIX, '/var/lib/gentoo/gkeys']) |
| 48 |
self.defaults['keyring'] = '%(gkeysdir)s/keyring' |
Archives