From 3e0df60e17ded357cdacc4c3cc35a7440b71d853 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 6 Jun 2010 00:31:41 +0200 Subject: [PATCH] fix path handling in keyringanalyzer --- ddportfolioservice/model/keyringanalyzer.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ddportfolioservice/model/keyringanalyzer.py b/ddportfolioservice/model/keyringanalyzer.py index 7ef1cbe..8af2449 100644 --- a/ddportfolioservice/model/keyringanalyzer.py +++ b/ddportfolioservice/model/keyringanalyzer.py @@ -31,6 +31,7 @@ import pkg_resources import glob import ConfigParser import os +import os.path def _get_keyrings(): @@ -38,10 +39,10 @@ def _get_keyrings(): configured in ddportfolio.ini.""" my_config = ConfigParser.ConfigParser() my_config.readfp(pkg_resources.resource_stream(__name__, 'ddportfolio.ini')) - keyrings = glob.glob(my_config.get('DEFAULT', 'keyring.dir') + - '/*.gpg') - keyrings.extend(glob.glob(my_config.get('DEFAULT', 'keyring.dir') + - '/*.pgp')) + keyringdir = os.path.expanduser(my_config.get('DEFAULT', 'keyring.dir')) + print "keyrings dir %r" % keyringdir + keyrings = glob.glob(os.path.join(keyringdir, '*.gpg')) + keyrings.extend(glob.glob(os.path.join(keyringdir, '*.pgp'))) keyrings.sort() return keyrings