Removed version-check that required hg.
This commit is contained in:
parent
2c4a0a5fc8
commit
443a29d63f
3 changed files with 9 additions and 2 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -19,6 +19,13 @@ lib
|
||||||
lib64
|
lib64
|
||||||
__pycache__
|
__pycache__
|
||||||
|
|
||||||
|
# Other
|
||||||
|
*.swp
|
||||||
|
*.log
|
||||||
|
*.pid
|
||||||
|
*.restart
|
||||||
|
*.db3
|
||||||
|
|
||||||
# Installer logs
|
# Installer logs
|
||||||
pip-log.txt
|
pip-log.txt
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||||
#------------------------------------------------------------
|
#------------------------------------------------------------
|
||||||
try:
|
try:
|
||||||
f = open(os.pardir + os.sep + 'VERSION.txt', 'r''')
|
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()
|
f.close()
|
||||||
except IOError:
|
except IOError:
|
||||||
VERSION = "Unknown version"
|
VERSION = "Unknown version"
|
||||||
|
|
|
||||||
|
|
@ -281,7 +281,7 @@ def get_evennia_version():
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
f = open(settings.BASE_PATH + os.sep + "VERSION.txt", 'r')
|
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:
|
except IOError:
|
||||||
return "Unknown version"
|
return "Unknown version"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue