OpenStack Compute (nova)

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

  1. bexar-bug717467
  2. Merge into bexar
Proposed by Jay Pipes
Status: Merged
Approved by: Josh Kearney
Approved revision: 651
Merged at revision: 652
Proposed branch: lp:~jaypipes/nova/bexar-bug717467
Merge into: lp:nova/bexar
Diff against target: 38 lines (+12/-1)
2 files modified
Authors (+1/-0)
nova/db/sqlalchemy/migration.py (+11/-1)
To merge this branch: bzr merge lp:~jaypipes/nova/bexar-bug717467
Reviewer Review Type Date Requested Status
Josh Kearney (community) Approve
Thierry Carrez (community) Approve
Review via email: mp+50979@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Thierry Carrez (ttx) wrote :

Safe patch, and already in Cactus

review: Approve
Revision history for this message
Josh Kearney (jk0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Authors'
2--- Authors 2011-01-27 17:56:54 +0000
3+++ Authors 2011-02-23 19:31:01 +0000
4@@ -3,6 +3,7 @@
5 Anthony Young <sleepsonthefloor@gmail.com>
6 Antony Messerli <ant@openstack.org>
7 Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
8+Brian Schott <bschott@isi.edu> <bfschott@gmail.com>
9 Chiradeep Vittal <chiradeep@cloud.com>
10 Chmouel Boudjnah <chmouel@chmouel.com>
11 Chris Behrens <cbehrens@codestud.com>
12
13=== modified file 'nova/db/sqlalchemy/migration.py'
14--- nova/db/sqlalchemy/migration.py 2011-01-31 01:01:49 +0000
15+++ nova/db/sqlalchemy/migration.py 2011-02-23 19:31:01 +0000
16@@ -17,12 +17,22 @@
17 # under the License.
18
19 import os
20+import sys
21
22 from nova import flags
23
24 import sqlalchemy
25 from migrate.versioning import api as versioning_api
26-from migrate.versioning import exceptions as versioning_exceptions
27+
28+try:
29+ from migrate.versioning import exceptions as versioning_exceptions
30+except ImportError:
31+ try:
32+ # python-migration changed location of exceptions after 1.6.3
33+ # See LP Bug #717467
34+ from migrate import exceptions as versioning_exceptions
35+ except ImportError:
36+ sys.exit(_("python-migrate is not installed. Exiting."))
37
38 FLAGS = flags.FLAGS
39

Subscribers

People subscribed via source and target branches