Fix #309 - Squelch paranoid users
This commit is contained in:
parent
f0547b61b8
commit
f85b441041
@ -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()
|
||||
|
Reference in New Issue
Block a user