diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2012-03-22 18:21:00 -0400 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2012-03-22 18:21:00 -0400 |
| commit | 164fb0cd52f00dafb506952374168ce20309a5ea (patch) | |
| tree | 85af7399df4b7fa8359872658c0c67575649518f /nova | |
| parent | b5506fd87e296bb239f645d6ef2d5aa7fd409c46 (diff) | |
Assume migrate module missing __version__ is old
Fixes bug 962592
Change-Id: I9675b99df89d4f2d47e0a2fbfd13147fa1c7aeb7
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/migration.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index 14a111f9c..7338a6a80 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -29,10 +29,6 @@ import migrate from migrate.versioning import util as migrate_util -MIGRATE_PKG_VER = dist_version.StrictVersion(migrate.__version__) -USE_MIGRATE_PATCH = MIGRATE_PKG_VER < dist_version.StrictVersion('0.7.3') - - @migrate_util.decorator def patched_with_engine(f, *a, **kw): url = a[0] @@ -49,7 +45,9 @@ def patched_with_engine(f, *a, **kw): # TODO(jkoelker) When migrate 0.7.3 is released and nova depends # on that version or higher, this can be removed -if USE_MIGRATE_PATCH: +MIN_PKG_VERSION = dist_version.StrictVersion('0.7.3') +if (not hasattr(migrate, '__version__') or + dist_version.StrictVersion(migrate.__version__) < MIN_PKG_VERSION): migrate_util.with_engine = patched_with_engine |