From: Jason Ish <ish@unx.ca>
Date: Thu, 13 Dec 2018 14:45:14 +0000 (-0600)
Subject: version: hide git revision if unknown
X-Git-Tag: 1.1.0rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d759d30e7e395e4f09c57bfbfcf159b9b0d7a8b;p=thirdparty%2Fsuricata-update.git

version: hide git revision if unknown

This happens when suricata-update is installed bundled with
Suricata.  This is more a relic from the earlier days
of Suricata-Update when more users were likely to install
it directly from git anyways.
---

diff --git a/suricata/update/main.py b/suricata/update/main.py
index b1ad7f0..3fa2b0d 100644
--- a/suricata/update/main.py
+++ b/suricata/update/main.py
@@ -67,7 +67,7 @@ from suricata.update.version import version
 try:
     from suricata.update.revision import revision
 except:
-    revision = "unknown"
+    revision = None
 
 # Initialize logging, use colour if on a tty.
 if len(logging.root.handlers) == 0 and os.isatty(sys.stderr.fileno()):
@@ -1052,7 +1052,8 @@ def _main():
     global_args, rem = global_parser.parse_known_args()
 
     if global_args.version:
-        print("suricata-update version %s (rev: %s)" % (version, revision))
+        revision_string = " (rev: %s)" % (revision) if revision else ""
+        print("suricata-update version {}{}".format(version, revision_string))
         return 0
 
     if not rem or rem[0].startswith("-"):