diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-18 11:31:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-18 11:31:25 +0000 |
| commit | 58566a773fc40cbd8786c97e0a79d485fa82feea (patch) | |
| tree | cea24a6d457f21286ade942f824ea51aac9b9fd3 /nova/db | |
| parent | 0707f9b471f0a4f6964cf132502abfae89800360 (diff) | |
| parent | 9f7eaca80d259201844f097fec24d1e9fe9fb5e3 (diff) | |
| download | nova-58566a773fc40cbd8786c97e0a79d485fa82feea.tar.gz nova-58566a773fc40cbd8786c97e0a79d485fa82feea.tar.xz nova-58566a773fc40cbd8786c97e0a79d485fa82feea.zip | |
Merge "Remove trivial cases of unused variables (1)"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py | 3 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/utils.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py b/nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py index 88462a2c8..e8b9a1570 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py @@ -111,9 +111,6 @@ def _upgrade_bdm_v2(meta, bdm_table, bdm_shadow_table): _bdm_rows_v1 = ('id', 'device_name', 'virtual_name', 'snapshot_id', 'volume_id', 'instance_uuid') - _bdm_rows_v2 = ('id', 'source_type', 'destination_type', 'guest_format', - 'device_type', 'disk_bus', 'boot_index', 'image_id') - _instance_cols = ('uuid', 'image_ref', 'root_device_name') def _get_columns(table, names): diff --git a/nova/db/sqlalchemy/utils.py b/nova/db/sqlalchemy/utils.py index 67acad2b7..6c0a53846 100644 --- a/nova/db/sqlalchemy/utils.py +++ b/nova/db/sqlalchemy/utils.py @@ -73,7 +73,7 @@ def visit_insert_from_select(element, compiler, **kw): def _get_not_supported_column(col_name_col_instance, column_name): try: column = col_name_col_instance[column_name] - except Exception as e: + except Exception: msg = _("Please specify column %s in col_name_col_instance " "param. It is required because column has unsupported " "type by sqlite).") |