From 6ba529277a7f3d07a8182d94205197fbb256b144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Nov 2015 09:56:11 +0100 Subject: [PATCH] buildPythonPackage: catch_conflicts should ignore pip --- .../generic/{do_conflict.py => catch_conflicts.py} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/python-modules/generic/{do_conflict.py => catch_conflicts.py} (87%) diff --git a/pkgs/development/python-modules/generic/do_conflict.py b/pkgs/development/python-modules/generic/catch_conflicts.py similarity index 87% rename from pkgs/development/python-modules/generic/do_conflict.py rename to pkgs/development/python-modules/generic/catch_conflicts.py index 092bba4df23..35512bb44d3 100644 --- a/pkgs/development/python-modules/generic/do_conflict.py +++ b/pkgs/development/python-modules/generic/catch_conflicts.py @@ -8,7 +8,8 @@ packages = collections.defaultdict(list) for f in sys.path: for req in pkg_resources.find_distributions(f): if req not in packages[req.project_name]: - if req.project_name == 'setuptools': + # some exceptions inside buildPythonPackage + if req.project_name in ['setuptools', 'pip']: continue packages[req.project_name].append(req)