]> git.ipfire.org Git - nitsi.git/commitdiff
Parse settings completely before parsing the copy_from setting
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Thu, 14 Jun 2018 07:17:02 +0000 (09:17 +0200)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Thu, 14 Jun 2018 07:17:02 +0000 (09:17 +0200)
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
src/nitsi/test.py

index 5682752f7cb73537644f52acb89e7ebc9607a858..3732304cd571f802c846d43a82c46735fdcc399c 100755 (executable)
@@ -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)