Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-01 13:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1755 from vincent-lg/fix_1754

Browse source 
Fix #1754: WindowsError is replaced with OSError
This commit is contained in:
Griatch 2018-12-17 09:15:02 +01:00 • committed by GitHub
commit 92726040e7
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/__init__.py
View file

@ -105,7 +105,7 @@ def _create_version():
print(err)
try:
version = "%s (rev %s)" % (version, check_output("git rev-parse --short HEAD", shell=True, cwd=root, stderr=STDOUT).strip())
except (IOError, CalledProcessError, WindowsError):
except (IOError, CalledProcessError, OSError):
# ignore if we cannot get to git
pass
return version

2
evennia/server/evennia_launcher.py
View file

@ -1217,7 +1217,7 @@ def evennia_version():
"git rev-parse --short HEAD",
shell=True, cwd=EVENNIA_ROOT, stderr=STDOUT).strip()
version = "%s (rev %s)" % (version, rev)
except (IOError, CalledProcessError, WindowsError):
except (IOError, CalledProcessError, OSError):
# move on if git is not answering
pass
return version