From: Jason Ish <ish@unx.ca>
Date: Fri, 26 Jan 2018 22:14:11 +0000 (-0600)
Subject: dnp3-gen: require jinja2 v2.10 or later
X-Git-Tag: suricata-4.1.0-beta1~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f70e8d00eacf465da540482a814db7dcd993fcc1;p=thirdparty%2Fsuricata.git

dnp3-gen: require jinja2 v2.10 or later

Previous versions, but not all, have issues tracking
variables.
---

diff --git a/scripts/dnp3-gen/dnp3-gen.py b/scripts/dnp3-gen/dnp3-gen.py
index a1c23f152c..261b347fe4 100755
--- a/scripts/dnp3-gen/dnp3-gen.py
+++ b/scripts/dnp3-gen/dnp3-gen.py
@@ -705,6 +705,12 @@ def preprocess_object(obj):
 
 def main():
 
+    # Require Jinja2 2.10 or greater.
+    jv = jinja2.__version__.split(".")
+    if int(jv[0]) < 2 or (int(jv[0]) == 2 and int(jv[1]) < 10):
+        print("error: jinja2 v2.10 or great required")
+        return 1
+
     definitions = yaml.load(open("scripts/dnp3-gen/dnp3-objects.yaml"))
     print("Loaded %s objects." % (len(definitions["objects"])))
     definitions["objects"] = map(preprocess_object, definitions["objects"])