jan/debianmemberportfolio
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Merge remote branch 'origin/deployed'

Browse source 
* origin/deployed:
  silence keyringanalyzer
  fix path handling in keyringanalyzer
  add flattr button
This commit is contained in:
Jan Dittberner 2010-06-11 20:56:05 +02:00
parent c06107c597 71c24cf9e3
commit 556e254870
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ddportfolioservice/model/keyringanalyzer.py
View file

@ -31,6 +31,7 @@ import pkg_resources
import glob
import ConfigParser
import os
import os.path
def _get_keyrings():
@ -38,10 +39,9 @@ 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'))
keyrings = glob.glob(os.path.join(keyringdir, '*.gpg'))
keyrings.extend(glob.glob(os.path.join(keyringdir, '*.pgp')))
keyrings.sort()
return keyrings