Fix transport_maps function for non-existent domains
The postfix_transport_maps function had a bug causing
2012-04-15 17:40:22 CEST LOG: statement: SELECT transport FROM postfix_transport_map('logcheck', 'domine.madduck.net');
2012-04-15 17:40:22 CEST ERROR: query returned no rows
when the domain was not in the database. This would make did be NULL and make
the query fail.
This patch moves the tid query until after a check for did. If the latter is
NULL, the function RETURNs (rather than fails).
# -*- coding: UTF-8 -*-# Copyright (c) 2010 - 2011, Pascal Volk# See COPYING for distribution information.""" VirtualMailManager.cli.config ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Adds some interactive stuff to the Config class."""fromConfigParserimportRawConfigParserfromshutilimportcopy2fromVirtualMailManagerimportENCODINGfromVirtualMailManager.configimportConfig,ConfigValueError,LazyConfigfromVirtualMailManager.errorsimportConfigError,VMMErrorfromVirtualMailManager.cliimportw_err,w_stdfromVirtualMailManager.constantsimportCONF_ERROR,VMM_TOO_MANY_FAILURES_=lambdamsg:msgclassCliConfig(Config):"""Adds the interactive ``configure`` method to the `Config` class and overwrites `LazyConfig.set(), in order to update a single option in the configuration file with a single command line command. """defconfigure(self,sections):"""Interactive method for configuring all options of the given iterable ``sections`` object."""input_fmt=_(u'Enter new value for option %(option)s 'u'[%(current_value)s]: ')failures=0w_std(_(u'Using configuration file: %s\n')%self._cfg_filename)forsectioninsections:w_std(_(u"* Configuration section: '%s'")%section)foropt,valinself.items(section):failures=0whileTrue:newval=raw_input(input_fmt.encode(ENCODING,'replace')%{'option':opt,'current_value':val})ifnewvalandnewval!=val:try:LazyConfig.set(self,'%s.%s'%(section,opt),newval)breakexcept(ValueError,ConfigValueError,VMMError),err:w_err(0,_(u'Warning: %s')%err)failures+=1iffailures>2:raiseConfigError(_(u'Too many failures - try 'u'again later.'),VMM_TOO_MANY_FAILURES)else:breakprintifself._modified:self._save_changes()defset(self,option,value):"""Set the value of an option. If the new `value` has been set, the configuration file will be immediately updated. Throws a ``ConfigError`` if `value` couldn't be converted to ``LazyConfigOption.cls`` or ``LazyConfigOption.validate`` fails."""section,option_=self._get_section_option(option)try:val=self._cfg[section][option_].cls(value)ifself._cfg[section][option_].validate:val=self._cfg[section][option_].validate(val)except(ValueError,ConfigValueError),err:raiseConfigError(str(err),CONF_ERROR)# Do not write default values also skip identical valuesifnotself._cfg[section][option_].defaultisNone:old_val=self.dget(option)else:old_val=self.pget(option)ifval==old_val:returnifnotRawConfigParser.has_section(self,section):self.add_section(section)RawConfigParser.set(self,section,option_,val)self._save_changes()def_save_changes(self):"""Writes changes to the configuration file."""copy2(self._cfg_filename,self._cfg_filename+'.bak')self._cfg_file=open(self._cfg_filename,'w')self.write(self._cfg_file)self._cfg_file.close()del_