Merge pull request kytos#403 from macartur/fix_conf_path

Fixing template prefix when BASE_ENV is '/'
macartur · May 19, 2017 · 781c926 · 781c926
2 parents 7224f66 + c5b2947
commit 781c926
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/etc/kytos/kytos.conf.template b/etc/kytos/kytos.conf.template
@@ -21,7 +21,7 @@ daemon = False
 debug = False
 
 # Logging config file. Please specify the full path of logging config file.
-logging = {{prefix}}/etc/kytos/logging.ini
+logging = {{ prefix }}/etc/kytos/logging.ini
 
 listen = 0.0.0.0
 

diff --git a/setup.py b/setup.py
@@ -174,6 +174,9 @@ def generate_file_from_template(cls, templates,
         """
         from jinja2 import Template
 
+        if kwargs.get('prefix').endswith('/'):
+            kwargs['prefix'] = kwargs['prefix'][:-1]
+
         cls.create_paths()
         for path in templates:
             with open(path, 'r', encoding='utf-8') as src_file: