From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5AE061386F1 for ; Sun, 9 Aug 2015 01:09:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6B5F1412D; Sun, 9 Aug 2015 01:09:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96756E0894 for ; Sun, 9 Aug 2015 01:09:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E451340B0C for ; Sun, 9 Aug 2015 01:09:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5889E130 for ; Sun, 9 Aug 2015 01:09:33 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1438574376.79b95d1d05ed9ce82b94167074b068e63cfa2cb8.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys/gkeys/base.py gkeys/gkeys/config.py X-VCS-Directories: gkeys/gkeys/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 79b95d1d05ed9ce82b94167074b068e63cfa2cb8 X-VCS-Branch: master Date: Sun, 9 Aug 2015 01:09:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 22e9a62d-0c14-4e43-80c9-a72e8bbc831e X-Archives-Hash: 7d3779d4956d2ea7ade11482c50f4475 commit: 79b95d1d05ed9ce82b94167074b068e63cfa2cb8 Author: Brian Dolbec gentoo org> AuthorDate: Wed Jul 29 04:39:37 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Aug 3 03:59:36 2015 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=79b95d1d gkeys: Fix the user config location and operation Move the config to ~/.config/gkeys/ along with the logs. Fix the improper ensure_dirs() call in base.py. gkeys/gkeys/base.py | 5 +++-- gkeys/gkeys/config.py | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py index 7fd9908..970ad7c 100644 --- a/gkeys/gkeys/base.py +++ b/gkeys/gkeys/base.py @@ -299,8 +299,8 @@ class CliBase(object): if not self.config.defaults['homedir']: self.config.defaults['homedir'] = os.path.expanduser('~') if not os.access(self.config['logdir'], os.W_OK): - self.config['logdir'] = ensure_dirs( - os.path.join(self.config['user-dir'], 'logs')) + self.config.options['logdir'] = os.path.join(self.config['userconfigdir'], 'logs') + ensure_dirs(self.config.options['logdir']) # establish our logger and update it in the imported files self.logger = set_logger(self.cli_config['prog'], self.config['logdir'], args.debug, dirmode=int(self.config.get_key('permissions', 'directories'),0), @@ -314,6 +314,7 @@ class CliBase(object): if args.config: self.logger.debug("Main: run; Found alternate config request: %s" % args.config) + self.logger.debug("Main: run; Using config: %s" % self.config['config']) # check if a -C, --category was input # if it was, check if the category is listed in the [seeds] diff --git a/gkeys/gkeys/config.py b/gkeys/gkeys/config.py index 7cd856a..592aad6 100644 --- a/gkeys/gkeys/config.py +++ b/gkeys/gkeys/config.py @@ -54,10 +54,11 @@ class GKeysConfig(GPGConfig): def _set_default_config(self): self.defaults['homedir'] = os.path.expanduser('~') - self.defaults['configdir'] = os.path.join( - self.defaults['homedir'], '.gkeys') + self.defaults['userconfigdir'] = os.path.join( + self.defaults['homedir'], '.config', 'gkeys') + self.defaults['configdir'] = self.defaults['userconfigdir'] self.defaults['config']= os.path.join( - self.defaults['configdir'], 'gkeys.conf') + self.defaults['userconfigdir'], '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' @@ -101,6 +102,9 @@ class GKeysConfig(GPGConfig): defaults[key] = self.defaults[key] if filename == None: filename = self.defaults['config'] + if "foo-bar'd" in filename: + print("Config: read_config(); Configuration ERROR: filename: %s, access: %s" + % (filename, os.access(filename, os.R_OK))) self.configparser = SaneConfigParser(defaults) self.configparser.read(filename) if self.configparser.has_section('base'):