1 --- cinder-2013.1-orig/cinder/__init__.py 2012-11-22 04:22:19.000000000 -0500
2 +++ cinder-2013.1/cinder/__init__.py 2012-12-20 12:57:42.337489999 -0500
4 .. moduleauthor:: Andy Smith <andy@anarkystic.com>
10 +# If there is a conflicting non egg module,
11 +# i.e. an older standard system module installed,
12 +# then replace it with this requirement
13 +def replace_dist(requirement):
15 + return pkg_resources.require(requirement)
16 + except pkg_resources.VersionConflict:
17 + e = sys.exc_info()[1]
20 + if dist.key == req.key and not dist.location.endswith('.egg'):
21 + del pkg_resources.working_set.by_key[dist.key]
22 + # We assume there is no need to adjust sys.path
23 + # and the associated pkg_resources.working_set.entries
24 + return pkg_resources.require(requirement)
26 +replace_dist("WebOb >= 1.0")
27 +replace_dist("SQLAlchemy >= 0.6.3")
28 +replace_dist("Routes >= 1.12.3")
30 +replace_dist("PasteDeploy >= 1.5.0")
31 +# This hack is needed because replace_dist() results in
32 +# the standard paste module path being at the start of __path__.
33 +# TODO: See can we get pkg_resources to do the right thing directly
35 +paste.__path__.insert(0, paste.__path__.pop(-1))
40 --- cinder-2013.1-orig/bin/cinder-manage 2012-11-22 04:22:19.000000000 -0500
41 +++ cinder-2013.1/bin/cinder-manage 2012-12-20 12:58:01.014504835 -0500
46 -from sqlalchemy import create_engine, MetaData, Table
47 -from sqlalchemy.ext.declarative import declarative_base
48 -from sqlalchemy.orm import sessionmaker
51 # If ../cinder/__init__.py exists, add ../ to Python search path, so that
53 from cinder import utils
54 from cinder import version
56 +from sqlalchemy import create_engine, MetaData, Table
57 +from sqlalchemy.orm import sessionmaker
58 +from sqlalchemy.ext.declarative import declarative_base
63 --- cinder-2013.1-orig/cinder/db/sqlalchemy/migration.py 2012-11-22 04:22:19.000000000 -0500
64 +++ cinder-2013.1/cinder/db/sqlalchemy/migration.py 2012-12-20 12:57:44.821491814 -0500
68 # NOTE(jkoelker) Delay importing migrate until we are patched
69 -from migrate import exceptions as versioning_exceptions
71 + # Try the more specific path first (migrate <= 0.6)
72 + from migrate.versioning import exceptions as versioning_exceptions
74 + # Use the newer path (migrate >= 0.7)
75 + from migrate import exceptions as versioning_exceptions
76 from migrate.versioning import api as versioning_api
77 from migrate.versioning.repository import Repository