490 destinations = alias.add_destinations(destinations, warnings) |
490 destinations = alias.add_destinations(destinations, warnings) |
491 if warnings: |
491 if warnings: |
492 self.__warnings.append(_('Ignored destination addresses:')) |
492 self.__warnings.append(_('Ignored destination addresses:')) |
493 self.__warnings.extend((' * %s' % w for w in warnings)) |
493 self.__warnings.extend((' * %s' % w for w in warnings)) |
494 for destination in destinations: |
494 for destination in destinations: |
495 gid = get_gid(self._dbh, destination.domainname) |
495 if get_gid(self._dbh, destination.domainname) and \ |
496 if gid and (not Handler.accountExists(self._dbh, destination) and |
496 not self._chk_other_address_types(destination, TYPE_RELOCATED): |
497 not Handler.aliasExists(self._dbh, destination)): |
|
498 self.__warnings.append( |
497 self.__warnings.append( |
499 _(u"The destination account/alias %r doesn't exist.") % |
498 _(u"The destination account/alias '%s' doesn't exist.") % |
500 str(destination)) |
499 destination) |
501 |
500 |
502 def user_delete(self, emailaddress, force=None): |
501 def user_delete(self, emailaddress, force=None): |
503 """Wrapper around Account.delete(...)""" |
502 """Wrapper around Account.delete(...)""" |
504 if force not in (None, 'delalias'): |
503 if force not in (None, 'delalias'): |
505 raise VMMError(_(u"Invalid argument: '%s'") % force, |
504 raise VMMError(_(u"Invalid argument: '%s'") % force, |