Merge "Allow updating empty created v2 images from v1"

2014-01-22 15:59:55 +00:00
parent a801e8731a 3c5efdb74e
commit b6468e0a01
2 changed files with 47 additions and 1 deletions
@@ -99,7 +99,7 @@ class ImageManager(base.Manager):
        for key in ['size', 'min_ram', 'min_disk']:
            if key in meta:
                try:
-                    meta[key] = int(meta[key])
+                    meta[key] = int(meta[key]) if meta[key] else 0
                except ValueError:
                    pass
        return meta