centos7/rpm/SOURCES/openstack-ceilometer-newdeps.patch

   1 diff -Naur ceilometer-2014.1.b2.orig/ceilometer/__init__.py ceilometer-2014.1.b2/ceilometer/__init__.py
   2 --- ceilometer-2014.1.b2.orig/ceilometer/__init__.py    2014-01-23 14:55:44.000000000 +0000
   3 +++ ceilometer-2014.1.b2/ceilometer/__init__.py 2014-01-27 15:03:39.691353920 +0000
   4 @@ -0,0 +1,21 @@
   5 +import sys
   6 +import pkg_resources
   7 +
   8 +# If there is a conflicting non egg module,
   9 +# i.e. an older standard system module installed,
  10 +# then replace it with this requirement
  11 +def replace_dist(requirement):
  12 +    try:
  13 +        return pkg_resources.require(requirement)
  14 +    except pkg_resources.VersionConflict:
  15 +        e = sys.exc_info()[1]
  16 +        dist=e.args[0]
  17 +        req=e.args[1]
  18 +        if dist.key == req.key and not dist.location.endswith('.egg'):
  19 +            del pkg_resources.working_set.by_key[dist.key]
  20 +            # We assume there is no need to adjust sys.path
  21 +            # and the associated pkg_resources.working_set.entries
  22 +            return pkg_resources.require(requirement)
  23 +
  24 +replace_dist("WebOb >= 1.2")
  25 +replace_dist("SQLAlchemy >= 0.7.3")