# HG changeset patch # User Pascal Volk # Date 1346617096 0 # Node ID b994444f7dee8b1f31217aeadcd9c0e453ecceef # Parent 7fdc4b2d4640975c33189aa0c894888a8eaf991b VMM/handler: Fixed user{quota,services,transport} subcommands. The subcommands user{quota,services,transport} actually failed with the arguments '
domain'. This is part II of changeset a75923ce2842 diff -r 7fdc4b2d4640 -r b994444f7dee 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)