Author: varkoly Date: Tue Sep 4 10:58:13 2007 New Revision: 40742 URL: http://svn.opensuse.org/viewcvs/yast?rev=40742&view=rev Log: #266883 - yast2-mail attempts to parse the package database everytime although I have not selected to install more stuff. #291378 - Enable Virus scanning does not install clamav Modified: trunk/mail/src/Mail.ycp Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=40742&r1=40741&r2=40742&view=diff ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Tue Sep 4 10:58:13 2007 @@ -280,8 +280,7 @@ } } - if (size (fetchmail) > 0 && - ! Package::Installed ("fetchmail")) + if (size (fetchmail) > 0 && ! Package::Installed ("fetchmail")) { install_packages = add (install_packages, "fetchmail"); // Translators: popup message part, ends with a newline @@ -291,10 +290,14 @@ if ((postfix_mda == `cyrus) && ! Package::Installed("cyrus-imapd")) { - install_packages = add(install_packages,"cyrus-imapd"); + install_packages = add(install_packages,"cyrus-imapd"); // Translators: popup message part, ends with a newline message = message + _("Cyrus-imapd, an IMAP server, will be installed.\n"); } + if( install_packages != [] ) + { + Package::DoInstall(install_packages); + } return message; } @@ -415,8 +418,8 @@ // amavis string amavis_pkg = "amavisd-new"; amavis_allowed = PackageSystem::Installed (amavis_pkg) || - Mode::commandline () || - PackageSystem::Available (amavis_pkg); + Mode::commandline (); + // || PackageSystem::Available (amavis_pkg); use_amavis = amavis_allowed && (SCR::Read (.sysconfig.amavis.USE_AMAVIS) == "yes"); // local_domains @@ -730,10 +733,7 @@ SCR::Write (.sysconfig.amavis.USE_AMAVIS, use_amavis? "yes":"no"); // used also in WriteServices amavis_service = true; - if (amavis_service) - { - Service::Adjust ("amavis", use_amavis? "enable":"disable"); - } + Service::Adjust ("amavis", use_amavis? "enable":"disable"); // SENDMAIL_ARGS // by default they contain -q30m, not good for dial-up -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org