OpenStack Compute (nova)

Merge lp:~jk0/nova/lp816236-d3 into lp:~hudson-openstack/nova/milestone-proposed

  1. lp816236-d3
  2. Merge into milestone-proposed
Proposed by Josh Kearney
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1139
Merged at revision: 1142
Proposed branch: lp:~jk0/nova/lp816236-d3
Merge into: lp:~hudson-openstack/nova/milestone-proposed
Diff against target: 16 lines (+5/-2)
1 file modified
nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py (+5/-2)
To merge this branch: bzr merge lp:~jk0/nova/lp816236-d3
Reviewer Review Type Date Requested Status
OpenStack release team Pending
Review via email: mp+69563@code.launchpad.net

Description of the change

Fail silently.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py'
2--- nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py 2011-07-27 20:22:51 +0000
3+++ nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py 2011-07-27 21:37:43 +0000
4@@ -36,8 +36,11 @@
5 migrations.create_column(instance_uuid)
6
7 if migrate_engine.name == "mysql":
8- migrate_engine.execute("ALTER TABLE migrations DROP FOREIGN KEY " \
9- "`migrations_ibfk_1`;")
10+ try:
11+ migrate_engine.execute("ALTER TABLE migrations DROP FOREIGN KEY " \
12+ "`migrations_ibfk_1`;")
13+ except Exception: # Don't care, just fail silently.
14+ pass
15
16 migrations.c.instance_id.drop()
17

Subscribers

People subscribed via source and target branches