1 diff -Naur ceilometer-2013.1.g3.orig/ceilometer/__init__.py ceilometer-2013.1.g3/ceilometer/__init__.py
2 --- ceilometer-2013.1.g3.orig/ceilometer/__init__.py 2013-04-08 09:54:04.545469160 +0000
3 +++ ceilometer-2013.1.g3/ceilometer/__init__.py 2013-04-08 10:01:12.306302227 +0000
11 +# If there is a conflicting non egg module,
12 +# i.e. an older standard system module installed,
13 +# then replace it with this requirement
14 +def replace_dist(requirement):
16 + return pkg_resources.require(requirement)
17 + except pkg_resources.VersionConflict:
18 + e = sys.exc_info()[1]
21 + if dist.key == req.key and not dist.location.endswith('.egg'):
22 + del pkg_resources.working_set.by_key[dist.key]
23 + # We assume there is no need to adjust sys.path
24 + # and the associated pkg_resources.working_set.entries
25 + return pkg_resources.require(requirement)
27 +replace_dist("WebOb >= 1.2")
28 +replace_dist("SQLAlchemy >= 0.7.3")
32 gettext.install('ceilometer', unicode=1)
33 diff -Naur ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py
34 --- ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 09:54:04.608469135 +0000
35 +++ ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 10:06:21.515180041 +0000
39 # NOTE(jkoelker) Delay importing migrate until we are patched
40 -from migrate import exceptions as versioning_exceptions
42 + # Try the more specific path first (migrate <= 0.6)
43 + from migrate.versioning import exceptions as versioning_exceptions
45 + # Use the newer path (migrate >= 0.7)
46 + from migrate import exceptions as versioning_exceptions
48 from migrate.versioning import api as versioning_api
49 from migrate.versioning.repository import Repository