19065699 cinderclient-34 lost in recent upgrade
authordavid.comay@oracle.com
Wed, 25 Jun 2014 17:02:32 -0700
changeset 1971 4cb12c67c7a5
parent 1970 f37782924749
child 1972 c7caa92e2d34
19065699 cinderclient-34 lost in recent upgrade
components/python/cinderclient/Makefile
components/python/cinderclient/cinderclient-PYVER.p5m
components/python/cinderclient/resolve.deps
--- a/components/python/cinderclient/Makefile	Wed Jun 25 09:33:31 2014 -0600
+++ b/components/python/cinderclient/Makefile	Wed Jun 25 17:02:32 2014 -0700
@@ -36,9 +36,6 @@
 
 TPNO=			17869
 
-# depends on keystoneclient which is not Python 3 ready
-PYTHON_VERSIONS=	2.7 2.6
-
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
--- a/components/python/cinderclient/cinderclient-PYVER.p5m	Wed Jun 25 09:33:31 2014 -0600
+++ b/components/python/cinderclient/cinderclient-PYVER.p5m	Wed Jun 25 17:02:32 2014 -0700
@@ -23,6 +23,12 @@
 # Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
+#
+# As an earlier Python 3 version of cinderclient was published, we
+# continue to do so for now by dropping the dependency on the
+# corresponding keystoneclient as the latter is not Python 3 ready.
+#
+<transform depend fmri=library/python/keystoneclient-34 type=require -> drop>
 set name=pkg.fmri \
     value=pkg:/library/python/cinderclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
--- a/components/python/cinderclient/resolve.deps	Wed Jun 25 09:33:31 2014 -0600
+++ b/components/python/cinderclient/resolve.deps	Wed Jun 25 17:02:32 2014 -0700
@@ -1,2 +1,3 @@
 runtime/python-26
 runtime/python-27
+runtime/python-34