From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Thu, 14 Jun 2018 07:17:02 +0000 (+0200)
Subject: Parse settings completely before parsing the copy_from setting
X-Git-Url: http://git.ipfire.org/?p=nitsi.git;a=commitdiff_plain;h=129c0b0f83b20ebef8b7c5355029c9aaa5e4aaa0

Parse settings completely before parsing the copy_from setting

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 5682752..3732304 100755
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -46,6 +46,11 @@ class Test():
         self.description = self.config["DEFAULT"]["description"]
         self.copy_to = self.config["DEFAULT"]["copy_to"]
         self.copy_from = self.config["DEFAULT"]["copy_from"]
+        self.virtual_environ_name = self.config["VIRTUAL_ENVIRONMENT"]["name"]
+        self.virtual_environ_path = self.config["VIRTUAL_ENVIRONMENT"]["path"]
+        self.virtual_environ_path = os.path.normpath(self.path + "/" + self.virtual_environ_path)
+
+        # Parse copy_from setting
         self.copy_from = self.copy_from.split(",")
 
         tmp = []
@@ -67,9 +72,7 @@ class Test():
 
         self.copy_from = tmp
 
-        self.virtual_environ_name = self.config["VIRTUAL_ENVIRONMENT"]["name"]
-        self.virtual_environ_path = self.config["VIRTUAL_ENVIRONMENT"]["path"]
-        self.virtual_environ_path = os.path.normpath(self.path + "/" + self.virtual_environ_path)
+
 
     def virtual_environ_setup(self):
         self.virtual_environ = virtual_environ.Virtual_environ(self.virtual_environ_path)