From 9d5a0b13cacf13951b82b80d52e97b3f948fb427 Mon Sep 17 00:00:00 2001 From: Griatch Date: Wed, 24 Sep 2014 15:22:05 +0200 Subject: [PATCH] Fixed __version__ reporting in ev.py. --- ev.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ev.py b/ev.py index 3d996b0231..69f0940c25 100644 --- a/ev.py +++ b/ev.py @@ -36,12 +36,13 @@ import os ###################################################################### try: - f = open(os.path.dirname(os.path.abspath(__file__)) + os.sep + "VERSION", 'r') - __version__ = "Evennia %s-r%s" % (f.read().strip(), os.popen("hg id -i").read().strip()) - f.close() - del f + __version__ = "Evennia" + with open(os.path.dirname(os.path.abspath(__file__)) + os.sep + "VERSION.txt", 'r') as f: + __version__ += " %s" % f.read().strip() + rev = (os.popen("git rev-parse --short HEAD").read().strip()) + __version__ += "-%s" % (rev or "(unknown revision)") except IOError: - __version__ = "Evennia (unknown version)" + __version__ += " (unknown version)" ###################################################################### # Stop erroneous direct run (would give a traceback since django is