diff options
| -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 |