summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorMark Washenberger <mark.washenberger@rackspace.com>2011-05-17 12:33:58 -0400
committerMark Washenberger <mark.washenberger@rackspace.com>2011-05-17 12:33:58 -0400
commit4dfe3a6b9ae44654b50ea8d65ac18a7a10f5abe3 (patch)
tree360f68238082e95982f1ddf81d4621ad1877194e /nova
parent272519ccebc15096c6f93f6aad6e8e8a188ee533 (diff)
don't throw type errors on NoneType int conversions
Diffstat (limited to 'nova')
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/017_make_instance_type_id_an_integer.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/017_make_instance_type_id_an_integer.py b/nova/db/sqlalchemy/migrate_repo/versions/017_make_instance_type_id_an_integer.py
index 8da9108ce..cda890c94 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/017_make_instance_type_id_an_integer.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/017_make_instance_type_id_an_integer.py
@@ -13,6 +13,7 @@ def upgrade(migrate_engine):
for instance in migrate_engine.execute(instances.select()):
if instance.instance_type_id is None:
types[instance.id] = None
+ continue
try:
types[instance.id] = int(instance.instance_type_id)
except ValueError: