VirtualMailManager/account.py
changeset 613 7b3494f1a2ef
parent 611 8e9b0046bc8f
child 614 1ec3497a6733
equal deleted inserted replaced
612:924535664ecc 613:7b3494f1a2ef
   122             raise AErr(_(u"The mailbox format '%(mbfmt)s' requires Dovecot "
   122             raise AErr(_(u"The mailbox format '%(mbfmt)s' requires Dovecot "
   123                          u">= v%(version)s.") % {
   123                          u">= v%(version)s.") % {
   124                        'mbfmt': maillocation.mbformat,
   124                        'mbfmt': maillocation.mbformat,
   125                        'version': version_str(maillocation.dovecot_version)},
   125                        'version': version_str(maillocation.dovecot_version)},
   126                        INVALID_MAIL_LOCATION)
   126                        INVALID_MAIL_LOCATION)
   127         if self._transport and not maillocation.postfix and \
   127         transport = self._transport or self._domain.transport
   128           self._transport.transport.lower() in ('virtual:', 'virtual'):
   128         if not maillocation.postfix and \
       
   129           transport.transport.lower() in ('virtual:', 'virtual'):
   129             raise AErr(_(u"Invalid transport '%(transport)s' for mailbox "
   130             raise AErr(_(u"Invalid transport '%(transport)s' for mailbox "
   130                          u"format '%(mbfmt)s'.") %
   131                          u"format '%(mbfmt)s'.") %
   131                        {'transport': self._transport,
   132                        {'transport': transport,
   132                         'mbfmt': maillocation.mbformat}, INVALID_MAIL_LOCATION)
   133                         'mbfmt': maillocation.mbformat}, INVALID_MAIL_LOCATION)
   133         self._mail = maillocation
   134         self._mail = maillocation
   134         self._set_uid()
   135         self._set_uid()
   135 
   136 
   136     def _update_tables(self, column, value):
   137     def _update_tables(self, column, value):