aboutsummaryrefslogtreecommitdiff
path: root/conf.py
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2015-08-17 16:06:16 +0200
committerKarel Kočí <cynerd@email.cz>2015-08-17 16:11:00 +0200
commit4a1e2cd1ce5ce44fdf4461e0ea51f4f362b23256 (patch)
treeb41785922f8c8e6123a05849b245f61a0ead2889 /conf.py
parentca4f750f7738c6ab6a7bcc85ac0a7cbed58a7c35 (diff)
downloadlinux-conf-perf-4a1e2cd1ce5ce44fdf4461e0ea51f4f362b23256.tar.gz
linux-conf-perf-4a1e2cd1ce5ce44fdf4461e0ea51f4f362b23256.tar.bz2
linux-conf-perf-4a1e2cd1ce5ce44fdf4461e0ea51f4f362b23256.zip
Set configuration back do default and add overlap
Configuration is set back as it was before previous merge on branch master. Configurations for targets can be specified by overlapping configuration options with external config.
Diffstat (limited to 'conf.py')
-rw-r--r--conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf.py b/conf.py
index f8742d6..c2f1902 100644
--- a/conf.py
+++ b/conf.py
@@ -132,7 +132,7 @@ if os.path.isfile('.target'):
target = None
with open('.target', 'r') as f:
target = f.readline().rstrip()
- conffile = os.path.join('targets', target + '.py')
+ conffile = os.path.join('targets', target, 'conf.py')
if os.path.isfile(conffile):
ovconf = importlib.machinery.SourceFileLoader("module.name", conffile).load_module()
for name in dir(ovconf):