2 commits - pykolab/cli

[Jeroen van Meeuwen]

 pykolab/cli/cmd_list_quota.py |   28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 12ca626d2e928e8dbad888e738805e4274f70b08
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Sep 14 12:41:51 2012 +0100

    Resolve #1006:
    
    - Clause getting a quota root as it is not necessary for a quota root to even exist.
    - Clause receiving a response of (None, None, None) before applying any math.

diff --git a/pykolab/cli/cmd_list_quota.py b/pykolab/cli/cmd_list_quota.py
index c60f48e..fece3c3 100644
--- a/pykolab/cli/cmd_list_quota.py
+++ b/pykolab/cli/cmd_list_quota.py
@@ -64,15 +64,17 @@ def execute(*args, **kw):
             else:
                 print "No quota"
         except:
-            (quota_root, used, quota) = imap.get_quota_root(quota_folder)
-            if not quota_root == None and not used == None and not quota == None:
-                if quota == 0:
-                    print >> sys.stderr, _("The quota for folder %s is set to literally allow 0KB of storage.") % (quota_folder)
-                    print "%d (Used: %d, Percentage: %s)" % (quota, used, u'\u221E')
+            try:
+                (quota_root, used, quota) = imap.get_quota_root(quota_folder)
+                if not quota_root == None and not used == None and not quota == None:
+                    if quota == 0:
+                        print >> sys.stderr, _("The quota for folder %s is set to literally allow 0KB of storage.") % (quota_folder)
+                        print "%d (Used: %d, Percentage: %s)" % (quota, used, u'\u221E')
+                    else:
+                        percentage = round((used/quota)*100, 1)
+                        print "%d (Root: %s, Used: %d, Percentage: %d)" % (quota, quota_root, used, percentage)
                 else:
-                    percentage = round((used/quota)*100, 1)
-                    print "%d (Root: %s, Used: %d, Percentage: %d)" % (quota, quota_root, used, percentage)
-            else:
-                print "No quota"
-
+                    print "No quota"
+            except:
+                print "No quota root"
 


commit 319095b31f77403f2ac114b0c00887e4f19c256a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Sep 14 08:37:10 2012 +0100

    Make sure no division by zero occurs in listing quota. (#1005)

diff --git a/pykolab/cli/cmd_list_quota.py b/pykolab/cli/cmd_list_quota.py
index dfd8b75..c60f48e 100644
--- a/pykolab/cli/cmd_list_quota.py
+++ b/pykolab/cli/cmd_list_quota.py
@@ -55,15 +55,23 @@ def execute(*args, **kw):
         try:
             (used, quota) = imap.get_quota(quota_folder)
             if not used == None and not quota == None:
-                percentage = round((used/quota)*100, 1)
-                print "%d (Used: %d, Percentage: %d)" % (quota, used, percentage)
+                if quota == 0:
+                    print >> sys.stderr, _("The quota for folder %s is set to literally allow 0KB of storage.") % (quota_folder)
+                    print "%d (Used: %d, Percentage: %s)" % (quota, used, u'\u221E')
+                else:
+                    percentage = round((used/quota)*100, 1)
+                    print "%d (Used: %d, Percentage: %d)" % (quota, used, percentage)
             else:
                 print "No quota"
         except:
             (quota_root, used, quota) = imap.get_quota_root(quota_folder)
             if not quota_root == None and not used == None and not quota == None:
-                percentage = round((used/quota)*100, 1)
-                print "%d (Root: %s, Used: %d, Percentage: %d)" % (quota, quota_root, used, percentage)
+                if quota == 0:
+                    print >> sys.stderr, _("The quota for folder %s is set to literally allow 0KB of storage.") % (quota_folder)
+                    print "%d (Used: %d, Percentage: %s)" % (quota, used, u'\u221E')
+                else:
+                    percentage = round((used/quota)*100, 1)
+                    print "%d (Root: %s, Used: %d, Percentage: %d)" % (quota, quota_root, used, percentage)
             else:
                 print "No quota"