summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Washenberger <mark.washenberger@rackspace.com>2011-05-12 17:24:38 -0400
committerMark Washenberger <mark.washenberger@rackspace.com>2011-05-12 17:24:38 -0400
commitdbff37b9ae0893ce209ff0b8c8893987226bd081 (patch)
tree045c7e3401620700ad98bb003be98501fa80048a
parent81a65d46d261cb6998c6d714ca5769a661ad31ab (diff)
handle instance_type_ids that are NULL during upgrade to integers
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/016_make_instance_type_id_an_integer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/016_make_instance_type_id_an_integer.py b/nova/db/sqlalchemy/migrate_repo/versions/016_make_instance_type_id_an_integer.py
index 5d95c1024..e2d03ebf2 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/016_make_instance_type_id_an_integer.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/016_make_instance_type_id_an_integer.py
@@ -12,7 +12,7 @@ def upgrade(migrate_engine):
for instance in migrate_engine.execute(instances.select()):
try:
types[instance.id] = int(instance.instance_type_id)
- except ValueError:
+ except (ValueError, TypeError):
types[instance.id] = None
integer_column = Column('instance_type_id_int', Integer(), nullable=True)