diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-01 02:11:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-01 02:11:46 +0000 |
| commit | 3105b28e6481afe61dfef43bd1237e75bfb7b26b (patch) | |
| tree | 3d76f1f3c7ab2e5010fc29f6f14c100b3e2cc2d1 /nova | |
| parent | dda036044e2ddb249aef8d483269bcbf97141abd (diff) | |
| parent | 93bf1a0a6e4e017d221afde32679fb4f1d6aa00f (diff) | |
| download | nova-3105b28e6481afe61dfef43bd1237e75bfb7b26b.tar.gz nova-3105b28e6481afe61dfef43bd1237e75bfb7b26b.tar.xz nova-3105b28e6481afe61dfef43bd1237e75bfb7b26b.zip | |
Merge "Remove workaround for sqlalchemy-migration < 0.6.4"
Diffstat (limited to 'nova')
| -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 452c78c19..d46dc98b3 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -57,19 +57,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 |