summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-03-04 11:44:18 -0400
committerKali Kaneko <kali@leap.se>2016-03-21 15:46:51 -0400
commit3d2df02b549a32c15b2bb369a33789abadb60c92 (patch)
tree3f609819c4bd617b65a343b8ea231654e241a140 /src/leap
parent470d24ec886adedae6d47e684ab1dc14aa2c21ea (diff)
[bug] fix some version handling errors
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/__init__.py6
-rw-r--r--src/leap/bitmask/provider/__init__.py2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/leap/bitmask/__init__.py b/src/leap/bitmask/__init__.py
index 966ce91e..6ab55e53 100644
--- a/src/leap/bitmask/__init__.py
+++ b/src/leap/bitmask/__init__.py
@@ -38,11 +38,15 @@ def _is_release_version(version_str):
:rtype: bool
"""
parts = __version__.split('.')
- patch = parts[2]
+ try:
+ patch = parts[2]
+ except IndexError:
+ return False
return patch.isdigit()
from ._version import get_versions
__version__ = get_versions()['version']
+__version_hash__ = get_versions()['full-revisionid']
IS_RELEASE_VERSION = _is_release_version(__version__)
del get_versions
diff --git a/src/leap/bitmask/provider/__init__.py b/src/leap/bitmask/provider/__init__.py
index 4385a92f..60a41181 100644
--- a/src/leap/bitmask/provider/__init__.py
+++ b/src/leap/bitmask/provider/__init__.py
@@ -22,7 +22,7 @@ import os
from pkg_resources import parse_version
-from leap.bitmask import __short_version__ as BITMASK_VERSION
+from leap.bitmask import __version__ as BITMASK_VERSION
from leap.common.check import leap_assert
logger = logging.getLogger(__name__)