From 7d22b7a4ef14509ace539c0a4a888db9cd475ff5 Mon Sep 17 00:00:00 2001 From: Norm Jacobs <Norm.Jacobs@Oracle.COM> Date: Wed, 28 Mar 2012 19:58:59 +0200 Subject: [PATCH] 7155746 Userland python bits should use mediated links 7152343 userland and good eleven don't get along, awww 7085731 mediated link support for python --- components/python/nose/nose-27.p5m | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/components/python/nose/nose-27.p5m b/components/python/nose/nose-27.p5m index 131c794..e933eac 100644 --- a/components/python/nose/nose-27.p5m +++ b/components/python/nose/nose-27.p5m @@ -38,18 +38,14 @@ dir path=usr/lib/python2.7/vendor-packages/nose/plugins dir path=usr/lib/python2.7/vendor-packages/nose/sphinx -# nosetests-2.7 shows up and egg-info turns into a directory -# structure when the 2.7 version of setuptools appears, but -# we are not there yet -file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info # pkgdepend(1) and python 2.7 don't play well yet. -#file path=usr/bin/nosetests-2.7 pkg.depend.bypass-generate=.* -#file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt -#file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/entry_points.txt -#file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/not-zip-safe -#file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO -#file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt -#file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt +file path=usr/bin/nosetests-2.7 pkg.depend.bypass-generate=.* +file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt +file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/entry_points.txt +file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/not-zip-safe +file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO +file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt +file path=usr/lib/python2.7/vendor-packages/nose-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt file path=usr/lib/python2.7/vendor-packages/nose/__init__.py file path=usr/lib/python2.7/vendor-packages/nose/case.py file path=usr/lib/python2.7/vendor-packages/nose/commands.py @@ -96,6 +92,9 @@ file path=usr/lib/python2.7/vendor-packages/nose/usage.txt file path=usr/lib/python2.7/vendor-packages/nose/util.py +link path=usr/bin/nosetests target=nosetests-2.7 \ + mediator=python mediator-version=2.7 + # force a dependency on the Python 2.7 runtime depend fmri=__TBD pkg.debug.depend.file=python2.7 \ pkg.debug.depend.path=usr/bin type=require -- Gitblit v1.9.3