commit 93f97262de844a6095469b94a4313fc0e45fb9f2
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Jan 2 10:31:41 2015 +0100
Assume that JAVACONFDIRS is always defined in SCL environment
depgenerators/javadoc.req | 2 +-
depgenerators/maven.req | 2 +-
python/javapackages/common/config.py | 4 +---
3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/depgenerators/javadoc.req b/depgenerators/javadoc.req
index 1e91e7d..9c85a95 100755
--- a/depgenerators/javadoc.req
+++ b/depgenerators/javadoc.req
@@ -36,7 +36,7 @@ import json
from javapackages.common.config import get_config
-config = get_config(["%{javaconfdir}"])
+config = get_config()
if config:
javadoc_config = config.get("javadoc.req", {})
always_generate = javadoc_config.get("always_generate", set())
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index d14b233..408d23b 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -228,7 +228,7 @@ class TagBuilder(object):
return "{0}.{1}".format(major, minor)
def _get_config(self):
- config = get_config(['%{javaconfdir}'])
+ config = get_config()
return config.get('maven.req', {}) if config else {}
def _check_pom_deps(self):
diff --git a/python/javapackages/common/config.py b/python/javapackages/common/config.py
index 9f57776..e37c617 100644
--- a/python/javapackages/common/config.py
+++ b/python/javapackages/common/config.py
@@ -38,14 +38,12 @@ metadata_cache_f = "metadata.cache"
osgi_cache_f = "osgi.cache"
-def get_config(cfg_paths=None):
+def get_config():
"""
Returns list of dictionaries which represent configuration files.
"""
if 'JAVACONFDIRS' in os.environ:
config_paths = os.environ['JAVACONFDIRS'].split(os.pathsep)
- elif cfg_paths:
- config_paths = cfg_paths
else:
config_paths = ['/etc/java/']
Show replies by date