Fix quota error formatting in case of NoneType quota
authorSofia Papagiannaki <papagian@gmail.com>
Fri, 26 Oct 2012 11:49:14 +0000 (14:49 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Fri, 26 Oct 2012 11:49:14 +0000 (14:49 +0300)
snf-pithos-backend/pithos/backends/modular.py

index 82cdfe1..f789b88 100644 (file)
@@ -740,8 +740,8 @@ class ModularBackend(BaseBackend):
             account_quota = long(self._get_policy(account_node)['quota'])
             account_usage = self._get_statistics(account_node)[1]
             if (account_quota > 0 and account_usage + size_delta > account_quota):
-                       msg = """account_quota:%d, account_usage:%d, size:%d,
-                                        del_size:%d, pre_version_id:%d""" % (account_quota,
+                       msg = """account_quota:%s, account_usage:%s, size:%s,
+                                        del_size:%s, pre_version_id:%s""" % (account_quota,
                                                                                                                  account_usage,
                                                                                                                  size, del_size,
                                                                                                                  pre_version_id)
@@ -752,8 +752,8 @@ class ModularBackend(BaseBackend):
             container_quota = long(self._get_policy(container_node)['quota'])
             container_usage = self._get_statistics(container_node)[1]
             if (container_quota > 0 and container_usage + size_delta > container_quota):
-                       msg = """container_quota:%d, container_usage:%d, size:%d,
-                                        del_size:%d, pre_version_id:%d""" % (container_quota,
+                       msg = """container_quota:%s, container_usage:%s, size:%s,
+                                        del_size:%s, pre_version_id:%s""" % (container_quota,
                                                                                                                  container_usage,
                                                                                                                          size, del_size,
                                                                                                                          pre_version_id)