diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-04-30 11:35:40 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-04-30 12:03:20 +0100 |
| commit | 93bf1a0a6e4e017d221afde32679fb4f1d6aa00f (patch) | |
| tree | 86f2b64a4606db81283438359d20e047d43101af | |
| parent | 76bb37e049818cbde4ca890566d01e85439ce517 (diff) | |
| download | nova-93bf1a0a6e4e017d221afde32679fb4f1d6aa00f.tar.gz nova-93bf1a0a6e4e017d221afde32679fb4f1d6aa00f.tar.xz nova-93bf1a0a6e4e017d221afde32679fb4f1d6aa00f.zip | |
Remove workaround for sqlalchemy-migration < 0.6.4
We now require >=0.7.2
Change-Id: I07101a77e9f332c426eeabc74f9619827ce087e6
| -rw-r--r-- | nova/db/sqlalchemy/migration.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index 7338a6a80..dc9bf1ec0 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -52,19 +52,10 @@ if (not hasattr(migrate, '__version__') or # NOTE(jkoelker) Delay importing migrate until we are patched +from migrate import exceptions as versioning_exceptions from migrate.versioning import api as versioning_api from migrate.versioning.repository import Repository -try: - from migrate.versioning import exceptions as versioning_exceptions -except ImportError: - try: - # python-migration changed location of exceptions after 1.6.3 - # See LP Bug #717467 - from migrate import exceptions as versioning_exceptions - except ImportError: - sys.exit(_("python-migrate is not installed. Exiting.")) - FLAGS = flags.FLAGS _REPOSITORY = None |