Merge lp:~jaypipes/nova/bexar-bug717467 into lp:nova/bexar

[Jay Pipes]

Pull fix for LP #717467 (migrate.versioning ImportError) into Bexar 2011.1.1 release.

[Thierry Carrez (ttx)]

Safe patch, and already in Cactus

review: Approve

[Josh Kearney (jk0)]

review: Approve

=== modified file 'Authors'
--- Authors	2011-01-27 17:56:54 +0000
+++ Authors	2011-02-23 19:31:01 +0000
@@ -3,6 +3,7 @@
 Anthony Young <[e-mail]>
 Antony Messerli <[e-mail]>
 Armando Migliaccio <[e-mail]>
+Brian Schott <[e-mail]> <[e-mail]>
 Chiradeep Vittal <[e-mail]>
 Chmouel Boudjnah <[e-mail]>
 Chris Behrens <[e-mail]>
 
=== modified file 'nova/db/sqlalchemy/migration.py'
--- nova/db/sqlalchemy/migration.py	2011-01-31 01:01:49 +0000
+++ nova/db/sqlalchemy/migration.py	2011-02-23 19:31:01 +0000
@@ -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