From f85b4410412af9bde55d0e3baa7cda1a6a1b5589 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Mon, 27 Mar 2017 14:57:20 -1000 Subject: [PATCH] Fix #309 - Squelch paranoid users --- src/mcedit2/__init__.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/mcedit2/__init__.py b/src/mcedit2/__init__.py index 95e087e..699bd07 100644 --- a/src/mcedit2/__init__.py +++ b/src/mcedit2/__init__.py @@ -1,9 +1,9 @@ import subprocess import logging +import sys log = logging.getLogger(__name__) -__version__ = "HOMEBAKED" def get_git_version(): """ @@ -13,11 +13,18 @@ def get_git_version(): return subprocess.check_output('git describe --tags'.split()).strip() -try: - __version__ = get_git_version() -except Exception as e: - log.info("Failed to get git version") +def get_version(): + if not getattr(sys, 'frozen', False): + try: + return get_git_version() + except Exception as e: + log.info("Failed to get git version") try: - from _version import __version__ + from _version import __version__ as v + return v except Exception as e: - log.info("Failed to get version from version file, using %s", __version__) + ret = "HOMEBAKED" + log.info("Failed to get version from version file, using %s", ret) + return ret + +__version__ = get_version()