From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Sat, 23 Jun 2018 07:59:39 +0000 (+0200)
Subject: Fix check if we get an valid recipe file
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8da2bf327969e105d19ef73a8c4654c74eac4ff;p=nitsi.git

Fix check if we get an valid recipe file

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

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 3ee7936..b9ea034 100755
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -76,13 +76,14 @@ class Test():
                 logger.error("No such file: {}".format(self.settings_file))
                 raise TestException("No settings file found")
 
-        # os.path.isfile fails if self.recipe_file is None so we need to catch exceptions here
-        try:
-            if not (self.recipe_file or os.path.isfile(self.recipe_file)):
+        # os.path.isfile fails if self.recipe_file is None so we cannot use an and statement
+        if self.recipe_file:
+            if not os.path.isfile(self.recipe_file):
                 logger.error("No such file: {}".format(self.recipe_file))
                 raise TestException("No recipe file found")
-        except BaseException:
-            pass
+        else:
+            logger.error("No such file: {}".format(self.recipe_file))
+            raise TestException("No recipe file found")
 
 
         # Init logging