Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7079249 unable to upgrade snv_170 textinstall to snv_171:conflicting python packages
authorErik Trauschke <Erik.Trauschke@oracle.com>
Fri, 19 Aug 2011 08:33:43 -0700
changeset 484 63ed89d661a3
parent 483 039b6fd5ced3
child 485 9b12cda204fe
7079249 unable to upgrade snv_170 textinstall to snv_171:conflicting python packages
components/python/cherrypy/cherrypy-26.p5m file | annotate | diff | comparison | revisions
components/python/coverage/coverage-26.p5m file | annotate | diff | comparison | revisions
components/python/ldtp/ldtp-26.p5m file | annotate | diff | comparison | revisions
components/python/m2crypto/m2crypto-26.p5m file | annotate | diff | comparison | revisions
components/python/mako/mako-26.p5m file | annotate | diff | comparison | revisions
components/python/ply/ply-26.p5m file | annotate | diff | comparison | revisions
components/python/pybonjour/pybonjour-26.p5m file | annotate | diff | comparison | revisions
components/python/pycurl/pycurl-26.p5m file | annotate | diff | comparison | revisions 
--- a/components/python/cherrypy/cherrypy-26.p5m	Thu Aug 18 12:40:34 2011 -0700
+++ b/components/python/cherrypy/cherrypy-26.p5m	Fri Aug 19 08:33:43 2011 -0700
@@ -34,6 +34,8 @@
 
 license cherrypy.copyright license=BSD
 
+depend fmri=library/python-2/[email protected] type=optional
+
 dir path=usr
 dir path=usr/bin
 dir path=usr/lib
--- a/components/python/coverage/coverage-26.p5m	Thu Aug 18 12:40:34 2011 -0700
+++ b/components/python/coverage/coverage-26.p5m	Fri Aug 19 08:33:43 2011 -0700
@@ -39,6 +39,8 @@
 license jquery.copyright license=MIT-1
 license jquery.isonscreen.copyright license=MIT-2
 
+depend fmri=library/python-2/[email protected] type=optional
+
 dir path=usr
 dir path=usr/bin
 dir path=usr/lib
--- a/components/python/ldtp/ldtp-26.p5m	Thu Aug 18 12:40:34 2011 -0700
+++ b/components/python/ldtp/ldtp-26.p5m	Fri Aug 19 08:33:43 2011 -0700
@@ -33,6 +33,8 @@
 
 license ldtp.copyright license=LGPLv2.1
 
+depend fmri=system/desktop/[email protected] type=optional
+
 dir path=usr
 dir path=usr/bin
 dir path=usr/lib
--- a/components/python/m2crypto/m2crypto-26.p5m	Thu Aug 18 12:40:34 2011 -0700
+++ b/components/python/m2crypto/m2crypto-26.p5m	Fri Aug 19 08:33:43 2011 -0700
@@ -33,6 +33,8 @@
 
 license m2crypto.copyright license=BSD
 
+depend fmri=library/python-2/[email protected] type=optional
+
 dir path=usr
 dir path=usr/lib
 dir path=usr/lib/python2.6
--- a/components/python/mako/mako-26.p5m	Thu Aug 18 12:40:34 2011 -0700
+++ b/components/python/mako/mako-26.p5m	Fri Aug 19 08:33:43 2011 -0700
@@ -35,6 +35,7 @@
 license mako.copyright license=MIT
 
 depend fmri=runtime/python-26 type=require
+depend fmri=library/python-2/[email protected] type=optional
 
 dir path=mangled
 dir path=usr
--- a/components/python/ply/ply-26.p5m	Thu Aug 18 12:40:34 2011 -0700
+++ b/components/python/ply/ply-26.p5m	Fri Aug 19 08:33:43 2011 -0700
@@ -35,6 +35,7 @@
 license ply.copyright license=LGPLv2.1
 
 depend fmri=runtime/python-26 type=require
+depend fmri=library/python-2/[email protected] type=optional
 
 dir path=usr
 dir path=usr/lib
--- a/components/python/pybonjour/pybonjour-26.p5m	Thu Aug 18 12:40:34 2011 -0700
+++ b/components/python/pybonjour/pybonjour-26.p5m	Fri Aug 19 08:33:43 2011 -0700
@@ -36,6 +36,7 @@
 
 depend fmri=runtime/python-26 type=require
 depend fmri=service/network/dns/mdns type=require
+depend fmri=library/python-2/[email protected] type=optional
 
 dir path=usr
 dir path=usr/lib
--- a/components/python/pycurl/pycurl-26.p5m	Thu Aug 18 12:40:34 2011 -0700
+++ b/components/python/pycurl/pycurl-26.p5m	Fri Aug 19 08:33:43 2011 -0700
@@ -33,6 +33,8 @@
 
 license pycurl.copyright license=MIT
 
+depend fmri=library/python-2/[email protected] type=optional
+
 dir path=usr
 dir path=usr/lib
 dir path=usr/lib/python2.6
upstream/oracle/userland-gate