VMM/handler: Avoid unnecessary method calls. v0.7.x
authorPascal Volk <user@localhost.localdomain.org>
Mon, 09 Jun 2014 20:09:44 +0000
branchv0.7.x
changeset 758 332089388204
parent 757 3d592b5d5e2d
child 759 2a23083e2ea3
VMM/handler: Avoid unnecessary method calls.
VirtualMailManager/handler.py
--- a/VirtualMailManager/handler.py	Mon Jun 09 18:54:44 2014 +0000
+++ b/VirtualMailManager/handler.py	Mon Jun 09 20:09:44 2014 +0000
@@ -461,7 +461,7 @@
         dom = self._get_domain(domainname)
         gid = dom.gid
         domdir = dom.directory
-        if self._cfg.dget('domain.force_deletion') or force:
+        if force or self._cfg.dget('domain.force_deletion'):
             dom.delete(True)
         else:
             dom.delete(False)