python: fix parsing Suricata version from configure.ac

If parsing the version fails, or no version is found, fail
instead of defaulting to a version of 0.0.0.
pull/3988/head
Jason Ish 6 years ago committed by Victor Julien
parent 82de6e0659
commit 963abc961c

@ -8,18 +8,23 @@ import shutil
from distutils.core import setup from distutils.core import setup
from distutils.command.build_py import build_py from distutils.command.build_py import build_py
# Get the Suricata version from configure.ac.
version = None version = None
if os.path.exists("../configure.ac"): if os.path.exists("../configure.ac"):
with open("../configure.ac", "r") as conf: with open("../configure.ac", "r") as conf:
for line in conf: for line in conf:
m = re.search("AC_INIT\(suricata,\s+(\d.+)\)", line) if line.find("AC_INIT") > 1:
if m: m = re.search("AC_INIT\(\[suricata\],\[(\d.+)\]\)", line)
version = m.group(1) if m:
break version = m.group(1)
break
else:
print("error: failed to parse Suricata version from: %s" % (
line.strip()), file=sys.stderr)
sys.exit(1)
if version is None: if version is None:
print("error: failed to parse Suricata version, will use 0.0.0", print("error: failed to find Suricata version", file=sys.stderr)
file=sys.stderr) sys.exit(1)
version = "0.0.0"
class do_build(build_py): class do_build(build_py):
def run(self): def run(self):

Loading…
Cancel
Save