diff options
| author | Brian Schott <bfschott@gmail.com> | 2011-02-16 21:29:52 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-16 21:29:52 +0000 |
| commit | 2f79a9e57474bbe16085726eaeff47ba93e95e1d (patch) | |
| tree | 900c53ebb14d8cc8979d273710395eb069edbd0c /nova/db | |
| parent | 1016379757919e2bfbea6255edbca86048796c4e (diff) | |
| parent | 9be342534ee54f86c274f03d1d4a0c310f08e4ae (diff) | |
| download | nova-2f79a9e57474bbe16085726eaeff47ba93e95e1d.tar.gz nova-2f79a9e57474bbe16085726eaeff47ba93e95e1d.tar.xz nova-2f79a9e57474bbe16085726eaeff47ba93e95e1d.zip | |
-from migrate.versioning import exceptions as versioning_exceptions
+
+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."))
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/migration.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index 2a13c5466..d2671e1a3 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -17,12 +17,22 @@ # under the License. import os +import sys from nova import flags import sqlalchemy from migrate.versioning import api as versioning_api -from migrate.versioning import exceptions as versioning_exceptions + +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 |