From: Jason Ish <ish@unx.ca>
Date: Sun, 25 Mar 2018 14:27:26 +0000 (-0600)
Subject: don't see if suricata.yaml if value is None
X-Git-Tag: 1.0.0rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42504ad524cc5d9be1fe0f546a1bfe23bf1ec833;p=thirdparty%2Fsuricata-update.git

don't see if suricata.yaml if value is None
---

diff --git a/suricata/update/main.py b/suricata/update/main.py
index 2445046..d9f4d77 100644
--- a/suricata/update/main.py
+++ b/suricata/update/main.py
@@ -1246,7 +1246,8 @@ def _main():
 
     # Load the Suricata configuration if we can.
     suriconf = None
-    if os.path.exists(config.get("suricata-conf")) and \
+    if config.get("suricata-conf") and \
+       os.path.exists(config.get("suricata-conf")) and \
        suricata_path and os.path.exists(suricata_path):
         logger.info("Loading %s",config.get("suricata-conf"))
         suriconf = suricata.update.engine.Configuration.load(