From 443a29d63f891d66afa5c8bd673dae77c7429fcc Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 23 Jan 2014 01:17:39 +0100 Subject: [PATCH] Removed version-check that required hg. --- .gitignore | 7 +++++++ game/manage.py | 2 +- src/utils/utils.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ded6067880..878233d84f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,13 @@ lib lib64 __pycache__ +# Other +*.swp +*.log +*.pid +*.restart +*.db3 + # Installer logs pip-log.txt diff --git a/game/manage.py b/game/manage.py index faf0cf9432..7d2b725cd4 100755 --- a/game/manage.py +++ b/game/manage.py @@ -16,7 +16,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) #------------------------------------------------------------ try: f = open(os.pardir + os.sep + 'VERSION.txt', 'r''') - VERSION = "%s-r%s" % (f.read().strip(), os.popen("hg id -i").read().strip()) + VERSION = "%s" % f.read().strip() f.close() except IOError: VERSION = "Unknown version" diff --git a/src/utils/utils.py b/src/utils/utils.py index 9db208a2dc..efcaacfaf0 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -281,7 +281,7 @@ def get_evennia_version(): """ try: f = open(settings.BASE_PATH + os.sep + "VERSION.txt", 'r') - return "%s-r%s" % (f.read().strip(), os.popen("hg id -i").read().strip()) + return "%s-r%s" % (f.read().strip(), os.popen("git log --format=\"%H\" -n 1").read().strip()) except IOError: return "Unknown version"