From 12ac5fba0e05b05bcfbfa6dde61168048550376a Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Thu, 1 Sep 2016 00:15:09 -0400
Subject: [bug] fix conflicts installing namespace packages in dev/install mode

---
 src/leap/bitmask/__init__.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/leap/bitmask/__init__.py b/src/leap/bitmask/__init__.py
index 74f4e668..dba87b5e 100644
--- a/src/leap/bitmask/__init__.py
+++ b/src/leap/bitmask/__init__.py
@@ -1,4 +1,12 @@
-
+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')
-- 
cgit v1.2.3