VMM/Handler: fixed destination check in Handler.aliasAdd(). v0.6.x
authorPascal Volk <neverseen@users.sourceforge.net>
Fri, 30 Apr 2010 04:42:08 +0000
branchv0.6.x
changeset 282 28871c1be260
parent 281 59ff7c719697
child 283 ea6d052de24a
VMM/Handler: fixed destination check in Handler.aliasAdd().
VirtualMailManager/Handler.py
--- a/VirtualMailManager/Handler.py	Fri Apr 30 03:03:47 2010 +0000
+++ b/VirtualMailManager/Handler.py	Fri Apr 30 04:42:08 2010 +0000
@@ -492,12 +492,11 @@
             self.__warnings.append(_('Ignored destination addresses:'))
             self.__warnings.extend(('  * %s' % w for w in warnings))
         for destination in destinations:
-            gid = get_gid(self._dbh, destination.domainname)
-            if gid and (not Handler.accountExists(self._dbh, destination) and
-                        not Handler.aliasExists(self._dbh, destination)):
+            if get_gid(self._dbh, destination.domainname) and \
+              not self._chk_other_address_types(destination, TYPE_RELOCATED):
                 self.__warnings.append(
-                    _(u"The destination account/alias %r doesn't exist.") %
-                                       str(destination))
+                    _(u"The destination account/alias '%s' doesn't exist.") %
+                                       destination)
 
     def user_delete(self, emailaddress, force=None):
         """Wrapper around Account.delete(...)"""