diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2015-03-10 07:14:27 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2015-03-10 07:14:27 -0700 |
| commit | dfe6fd48a50d5753127a3720259f10312822a39b (patch) | |
| tree | 9b75fbb7fbc9b8418867118a81b36db8fddfded2 | |
| parent | gkeys/base.py: Fix expanduser error reported by K_F (diff) | |
| download | gentoo-keys-dfe6fd48a50d5753127a3720259f10312822a39b.tar.gz gentoo-keys-dfe6fd48a50d5753127a3720259f10312822a39b.tar.bz2 gentoo-keys-dfe6fd48a50d5753127a3720259f10312822a39b.zip | |
gkeys: Fix setting deafault location of homedir
Pass in the os.expanduser('~') setting to the config parser.
Comment out the gkeys.conf homedir setting so it can use the passed in default.
| -rw-r--r-- | gkeys/etc/gkeys.conf | 4 | ||||
| -rw-r--r-- | gkeys/gkeys/config.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf index 3f15051..e7a363f 100644 --- a/gkeys/etc/gkeys.conf +++ b/gkeys/etc/gkeys.conf @@ -16,7 +16,9 @@ gkeysdir: /var/lib/gentoo/gkeys # default user home directory -homedir: +# normally set by expanding ~ +# uncomment and edit for a custom location +#homedir: # user gkey directory diff --git a/gkeys/gkeys/config.py b/gkeys/gkeys/config.py index 96e85e6..1cac0b0 100644 --- a/gkeys/gkeys/config.py +++ b/gkeys/gkeys/config.py @@ -99,8 +99,8 @@ class GKeysConfig(GPGConfig): self.defaults[key] = self._sub_(self.defaults[key]) defaults = OrderedDict() # Add only the defaults we want in the configparser - for key in ['gkeysdir', 'keyring', 'sign-keydir', 'logdir', 'seedsdir', - 'keyserver']: + for key in ['gkeysdir', 'homedir', 'keyring', 'sign-keydir', 'logdir', + 'seedsdir', 'keyserver']: defaults[key] = self.defaults[key] if filename == None: filename = self.defaults['config'] |