Mailinglist Archive: yast-commit (819 mails)

< Previous Next >
[yast-commit] r54875 - /trunk/mail/src/MailServer.ycp
  • From: varkoly@xxxxxxxxxxxxxxxx
  • Date: Wed, 21 Jan 2009 18:02:46 -0000
  • Message-id: <E1LPhPa-0007HC-3W@xxxxxxxxxxxxxxxx>
Author: varkoly
Date: Wed Jan 21 19:02:45 2009
New Revision: 54875

URL: http://svn.opensuse.org/viewcvs/yast?rev=54875&view=rev
Log:
change the write order

Modified:
trunk/mail/src/MailServer.ycp

Modified: trunk/mail/src/MailServer.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=54875&r1=54874&r2=54875&view=diff
==============================================================================
--- trunk/mail/src/MailServer.ycp (original)
+++ trunk/mail/src/MailServer.ycp Wed Jan 21 19:02:45 2009
@@ -547,6 +547,73 @@
}
sleep(sl);

+ // write mail local delivery
+ // first we looking for if all the needed packages are installed
+ if(MailLocalDelivery["Type"]:"none" == "procmail"){
+ if(! procmail_installed)
+ {
+ if ( Report::AnyQuestion ("",_("You have not installed all needed
packages.") +
+ "\n procmail \n",
+ Label::InstallButton(),
+ Label::AbortButton(),
+ `focus_yes))
+ {
+ Package::DoInstall(["procmail"]);
+ }
+ else
+ {
+ return false;
+ }
+ }
+ }
+
+ if(Service::Status("saslauthd") > 0) {
+ Service::Start("saslauthd");
+ Service::Enable("saslauthd");
+ }
+
+ if(MailLocalDelivery["Type"]:"none" == "cyrus") {
+ if(!cyrus_installed)
+ {
+ if ( Report::AnyQuestion ("",_("You have not installed all needed
packages.") +
+ "\n cyrus-imapd \n",
+ Label::InstallButton(),
+ Label::AbortButton(),
+ `focus_yes))
+ {
+ Package::DoInstall(["cyrus-imapd"]);
+ SCR::UnmountAgent(.etc.imapd_conf);
+ }
+ else
+ {
+ return false;
+ }
+ }
+ string crypted = Users::CryptPassword(AdminPassword, "system", "foo");
+ SCR::Write(.target.passwd.cyrus, crypted);
+
+ if(Service::Status("cyrus") > 0) {
+ Service::Start("cyrus");
+ Service::Enable("cyrus");
+ }
+ } else {
+ if(cyrus_installed) {
+ Service::Stop("cyrus");
+ Service::Disable("cyrus");
+ }
+ }
+ if(Abort()) return false;
+ Progress::NextStage();
+ if( (boolean)MailLocalDelivery["Changed"]:false ) {
+ if( !
YaPI::MailServer::WriteMailLocalDelivery(MailLocalDelivery,AdminPassword) ) {
+ Report::Warning(_("Cannot write the mail server local delivery
settings."));
+ }
+ if(MailLocalDelivery["Type"]:"none" == "cyrus") {
+ Service::Reload("cyrus");
+ }
+ }
+ sleep(sl);
+
// write mail transports
if(Abort()) return false;
Progress::NextStep();
@@ -637,73 +704,6 @@
}
sleep(sl);

- // write mail local delivery
- // first we looking for if all the needed packages are installed
- if(MailLocalDelivery["Type"]:"none" == "procmail"){
- if(! procmail_installed)
- {
- if ( Report::AnyQuestion ("",_("You have not installed all needed
packages.") +
- "\n procmail \n",
- Label::InstallButton(),
- Label::AbortButton(),
- `focus_yes))
- {
- Package::DoInstall(["procmail"]);
- }
- else
- {
- return false;
- }
- }
- }
-
- if(Service::Status("saslauthd") > 0) {
- Service::Start("saslauthd");
- Service::Enable("saslauthd");
- }
-
- if(MailLocalDelivery["Type"]:"none" == "cyrus") {
- if(!cyrus_installed)
- {
- if ( Report::AnyQuestion ("",_("You have not installed all needed
packages.") +
- "\n cyrus-imapd \n",
- Label::InstallButton(),
- Label::AbortButton(),
- `focus_yes))
- {
- Package::DoInstall(["cyrus-imapd"]);
- SCR::UnmountAgent(.etc.imapd_conf);
- }
- else
- {
- return false;
- }
- }
- string crypted = Users::CryptPassword(AdminPassword, "system", "foo");
- SCR::Write(.target.passwd.cyrus, crypted);
-
- if(Service::Status("cyrus") > 0) {
- Service::Start("cyrus");
- Service::Enable("cyrus");
- }
- } else {
- if(cyrus_installed) {
- Service::Stop("cyrus");
- Service::Disable("cyrus");
- }
- }
- if(Abort()) return false;
- Progress::NextStage();
- if( (boolean)MailLocalDelivery["Changed"]:false ) {
- if( !
YaPI::MailServer::WriteMailLocalDelivery(MailLocalDelivery,AdminPassword) ) {
- Report::Warning(_("Cannot write the mail server local delivery
settings."));
- }
- if(MailLocalDelivery["Type"]:"none" == "cyrus") {
- Service::Reload("cyrus");
- }
- }
- sleep(sl);
-
// write mail server fetching jobs
if(Abort()) return false;
if(FetchingMail["Items"]:[] != []){

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages