VMM/handler: Fixed user{quota,services,transport} subcommands.
authorPascal Volk <user@localhost.localdomain.org>
Sun, 02 Sep 2012 20:18:16 +0000
changeset 605 b994444f7dee
parent 604 7fdc4b2d4640
child 606 ab97727357a4
VMM/handler: Fixed user{quota,services,transport} subcommands. The subcommands user{quota,services,transport} actually failed with the arguments '<address> domain'. This is part II of changeset a75923ce2842
VirtualMailManager/handler.py
--- a/VirtualMailManager/handler.py	Sun Sep 02 17:23:46 2012 +0000
+++ b/VirtualMailManager/handler.py	Sun Sep 02 20:18:16 2012 +0000
@@ -813,7 +813,7 @@
         if not acc:
             raise VMMError(_(u"The account '%s' does not exist.") %
                         acc.address, NO_SUCH_ACCOUNT)
-        if bytes_ == 'default':
+        if bytes_ == 'domain':
             quotalimit = None
         else:
             if not all(isinstance(i, (int, long)) for i in (bytes_, messages)):
@@ -832,7 +832,7 @@
         if not acc:
             raise VMMError(_(u"The account '%s' does not exist.") %
                            acc.address, NO_SUCH_ACCOUNT)
-        if transport == 'default':
+        if transport == 'domain':
             transport = None
         else:
             transport = Transport(self._dbh, transport=transport)
@@ -844,7 +844,7 @@
         if not acc:
             raise VMMError(_(u"The account '%s' does not exist.") %
                         acc.address, NO_SUCH_ACCOUNT)
-        if len(services) == 1 and services[0] == 'default':
+        if len(services) == 1 and services[0] == 'domain':
             serviceset = None
         else:
             kwargs = dict.fromkeys(SERVICES, False)