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