Fix up ldtp manifests oi_151a
authorJon Tibble <meths@btinternet.com>
Wed, 25 Apr 2012 22:03:09 +0100
branchoi_151a
changeset 281 1d2af586f78c
parent 280 269bf53852b7
child 282 1f6815d95a06
Fix up ldtp manifests
components/python/ldtp/ldtp-26.p5m
components/python/ldtp/ldtp.p5m
--- a/components/python/ldtp/ldtp-26.p5m	Wed Apr 25 21:51:30 2012 +0100
+++ b/components/python/ldtp/ldtp-26.p5m	Wed Apr 25 22:03:09 2012 +0100
@@ -42,7 +42,7 @@
 dir path=usr/lib/python2.6/vendor-packages/ldtpd
 dir path=usr/lib/python2.6/vendor-packages/ldtputils
 dir path=usr/lib/python2.6/vendor-packages/ooldtp
-file path=usr/bin/ldtp
+file path=usr/bin/ldtp pkg.depend.bypass-generate=.*
 file \
     path=usr/lib/python2.6/vendor-packages/ldtp-$(COMPONENT_VERSION)-py2.6.egg-info
 file path=usr/lib/python2.6/vendor-packages/ldtp/__init__.py
@@ -71,3 +71,4 @@
 file path=usr/lib/python2.6/vendor-packages/ldtputils/__init__.py
 file path=usr/lib/python2.6/vendor-packages/ooldtp/__init__.py
 file path=usr/lib/python2.6/vendor-packages/ooldtp/_context.py
+depend fmri=runtime/python-26 type=require
--- a/components/python/ldtp/ldtp.p5m	Wed Apr 25 21:51:30 2012 +0100
+++ b/components/python/ldtp/ldtp.p5m	Wed Apr 25 22:03:09 2012 +0100
@@ -29,9 +29,7 @@
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=system/desktop/ldtp-26 predicate=runtime/python-26 \
-    type=conditional
-
 legacy pkg=SUNWldtp \
     desc="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications." \
     name="Linux Desktop Testing Project"
+depend fmri=system/desktop/ldtp-26 type=require