From b7893e731972210596c16288e91f96f282c1eb6e Mon Sep 17 00:00:00 2001 From: Vincent Le Goff Date: Tue, 11 Dec 2018 17:54:27 +0100 Subject: [PATCH] Fix #1754: WindowsError is replaced with OSError --- evennia/__init__.py | 2 +- evennia/server/evennia_launcher.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/__init__.py b/evennia/__init__.py index ab23ff7abf..163f23e04d 100644 --- a/evennia/__init__.py +++ b/evennia/__init__.py @@ -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 diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 6387055736..5cd3cba524 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -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