From 4d8e63e890e88c58feb750dd56ecbf60bed9b462 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Tue, 27 Sep 2016 14:18:57 -0400 Subject: [feature] launch backend from the qt gui entrypoint --- src/leap/bitmask/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/leap/bitmask/__init__.py') diff --git a/src/leap/bitmask/__init__.py b/src/leap/bitmask/__init__.py index dba87b5..20719d4 100644 --- a/src/leap/bitmask/__init__.py +++ b/src/leap/bitmask/__init__.py @@ -1,12 +1,14 @@ +import sys import pkg_resources from ._version import get_versions __version__ = get_versions()['version'] del get_versions -# FIXME: HACK for https://github.com/pypa/pip/issues/3 -# Without this 'fix', there are resolution conflicts when pip installs at the -# same time bitmask in develop mode and other package in the leap namespace -# from pypi. For instance: -# 'pip install -e .' and 'pip install leap.common' -pkg_resources.get_distribution('leap.bitmask') +if not getattr(sys, 'frozen', False): + # FIXME: HACK for https://github.com/pypa/pip/issues/3 + # Without this 'fix', there are resolution conflicts when pip installs at + # the same time bitmask in develop mode and other package in the leap + # namespace from pypi. For instance: + # 'pip install -e .' and 'pip install leap.common' + pkg_resources.get_distribution('leap.bitmask') -- cgit v1.2.3