We have improved our config files handling and now they are always available at /etc/autoqa. We no longer need to try to load them from CWD. Let's remove that code (less ambiguity). --- lib/python/bodhi_utils.py | 2 +- lib/python/config.py | 2 +- lib/python/repoinfo.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/python/bodhi_utils.py b/lib/python/bodhi_utils.py index 2df40f8..92ccb2f 100644 --- a/lib/python/bodhi_utils.py +++ b/lib/python/bodhi_utils.py @@ -38,7 +38,7 @@ def _init():
try: fas_conf = SingleConfigParser() - fas_conf.read_single(['fas.conf', '/etc/autoqa/fas.conf']) + fas_conf.read('/etc/autoqa/fas.conf') fas = fas_conf.get_section('fas') user = fas['username'] pswd = fas['password'] diff --git a/lib/python/config.py b/lib/python/config.py index 1d7bc73..29eac2c 100644 --- a/lib/python/config.py +++ b/lib/python/config.py @@ -102,7 +102,7 @@ def getbool(value):
autoqa_conf = SingleConfigParser() -autoqa_conf.read_single(['autoqa.conf', '/etc/autoqa/autoqa.conf']) +autoqa_conf.read('/etc/autoqa/autoqa.conf')
if __name__ == '__main__': print "logdir = %s" % logdir diff --git a/lib/python/repoinfo.py b/lib/python/repoinfo.py index de9f2de..b397744 100644 --- a/lib/python/repoinfo.py +++ b/lib/python/repoinfo.py @@ -23,8 +23,7 @@ from ConfigParser import SafeConfigParser from config import SingleConfigParser import warnings
-configpath = ('repoinfo.conf', - '/etc/autoqa/repoinfo.conf',) +configpath = ('/etc/autoqa/repoinfo.conf',)
class RepoinfoConfig(object): def __init__(self, arch="$basearch", filelist=configpath, defaults={}):