From d06906297200f394a9141036349c88e6a043dca4 Mon Sep 17 00:00:00 2001 From: Guba Sándor <guba.sandor@cloud.bme.hu> Date: Thu, 20 Mar 2014 14:39:11 +0100 Subject: [PATCH] storage: fixed disk clean --- circle/storage/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle/storage/models.py b/circle/storage/models.py index a3a26d6..c46ec0e 100644 --- a/circle/storage/models.py +++ b/circle/storage/models.py @@ -288,7 +288,7 @@ class Disk(AclBase, TimeStampedModel): return u"%s (#%d)" % (self.name, self.id or 0) def clean(self, *args, **kwargs): - if self.size == "" and self.base: + if (self.size is None or "") and self.base: self.size = self.base.size super(Disk, self).clean(*args, **kwargs) @@ -346,6 +346,7 @@ class Disk(AclBase, TimeStampedModel): """ datastore = params.pop('datastore', DataStore.objects.get()) disk = cls(filename=str(uuid.uuid4()), datastore=datastore, **params) + disk.clean() disk.save() logger.debug("Disk created: %s", params) with disk_activity(code_suffix="create", -- libgit2 0.26.0