Author: varkoly Date: Wed Sep 12 15:21:52 2007 New Revision: 40877 URL: http://svn.opensuse.org/viewcvs/yast?rev=40877&view=rev Log: avoid versionless Provides and Requiers now mail use the CommandLine module Modified: trunk/mail/src/Mail.ycp trunk/mail/src/MailServer.ycp trunk/mail/src/mail-advanced.ycp trunk/mail/src/mail-server_complex.ycp trunk/mail/src/mail.ycp trunk/mail/yast2-mail.spec.in Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=40877&r1=40876&r2=40877&view=diff ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Wed Sep 12 15:21:52 2007 @@ -308,6 +308,7 @@ */ define void ReadMta () ``{ // so that AY cloning works, #45071 + y2milestone ("========== Reading MTA =========="); if (PackageSystem::Installed ("sendmail")) { mta = `sendmail; @@ -320,6 +321,7 @@ { mta = `other; } + y2milestone ("Read MTA: %1", mta); } /** Modified: trunk/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=40877&r1=40876&r2=40877&view=diff ============================================================================== --- trunk/mail/src/MailServer.ycp (original) +++ trunk/mail/src/MailServer.ycp Wed Sep 12 15:21:52 2007 @@ -65,6 +65,11 @@ // Settings: Define all variables needed for configuration of mail-server /** + * True if the modul was started with the option 'setup'. + */ +global boolean setup = false; + +/** * True if there is server certificate. */ global boolean CertExist = false; Modified: trunk/mail/src/mail-advanced.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-advanced.ycp?rev=40877&r1=40876&r2=40877&view=diff ============================================================================== --- trunk/mail/src/mail-advanced.ycp (original) +++ trunk/mail/src/mail-advanced.ycp Wed Sep 12 15:21:52 2007 @@ -78,29 +78,6 @@ } } -/* - after merging yast2-mail and yast2-mail-server we have to be - carefull not to corrupt the configuration of the other modul -*/ -if( !setup && SCR::Read (.sysconfig.mail.MAIL_CREATE_CONFIG)== "yes" ) -{ - if( - ! Popup::AnyQuestionRichText( - Label::WarningMsg(), - _("You have configured your MTA without LDAP support.<br>") + - _("This modul will configure your MTA with LDAP support.<br>") + - _("This will corrupt your actuall configuration."), - 80, 10, - Label::ContinueButton(), - Label::CancelButton(), - `focus_no - ) - ) - { - return nil; - } -} - /* main ui function */ any ret = nil; Modified: trunk/mail/src/mail-server_complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_complex.ycp?rev=40877&r1=40876&r2=40877&view=diff ============================================================================== --- trunk/mail/src/mail-server_complex.ycp (original) +++ trunk/mail/src/mail-server_complex.ycp Wed Sep 12 15:21:52 2007 @@ -91,7 +91,31 @@ * Read settings dialog * @return `abort if aborted and `next otherwise */ -symbol ReadDialog() { +symbol ReadDialog() +{ + /* + after merging yast2-mail and yast2-mail-server we have to be + carefull not to corrupt the configuration of the other modul + */ + if( !MailServer::setup && SCR::Read (.sysconfig.mail.MAIL_CREATE_CONFIG)== "yes" ) + { + if( + ! Popup::AnyQuestionRichText( + Label::WarningMsg(), + _("You have configured your MTA without LDAP support.<br>") + + _("This modul will configure your MTA with LDAP support.<br>") + + _("This will corrupt your actuall configuration."), + 80, 10, + Label::ContinueButton(), + Label::CancelButton(), + `focus_no + ) + ) + { + return `abort; + } + } + Wizard::RestoreHelp(HELPS["read"]:""); boolean ret = MailServer::Read(); return ret ? `next : `abort; @@ -101,7 +125,8 @@ * Write settings dialog * @return `abort if aborted and `next otherwise */ -symbol WriteDialog() { +symbol WriteDialog() +{ Wizard::RestoreHelp(HELPS["write"]:""); boolean ret = MailServer::Write(); return ret ? `next : `abort; Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=40877&r1=40876&r2=40877&view=diff ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Wed Sep 12 15:21:52 2007 @@ -38,6 +38,7 @@ import "Wizard"; import "Popup"; import "Label"; + import "CommandLine"; /* The main () */ y2milestone ("Mail module started"); @@ -151,6 +152,8 @@ /****************/ /* MAIN ROUTINE */ /****************/ + +define any Main() ``{ /* parse arguments */ list args = WFM::Args (); @@ -203,6 +206,35 @@ ret = WFM::CallFunction("mail-standard",args); } +} + +define boolean Setup (map options) ``{ + Main(); + return true; +} +/** + * Command line definition + */ +map cmdline = $[ + /* Commandline help title */ + // configuration of hosts + "help" : _("Mail Server Configuration"), + "id" : "mail", + "guihandler": Main, +// "initialize": Host::Read, +// "finish" : Host::Write, // FIXME + "actions" : $[ + "setup" : $[ + /* Commandline command help */ + "help" : _("Setup the Mail Server Configuration"), + "handler" : Setup, + ], + ], +]; + +any ret = CommandLine::Run(cmdline); +y2debug("ret=%1", ret); + /* Finish */ y2milestone ("Mail module finished"); return ret; Modified: trunk/mail/yast2-mail.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/yast2-mail.spec.in?rev=40877&r1=40876&r2=40877&view=diff ============================================================================== --- trunk/mail/yast2-mail.spec.in (original) +++ trunk/mail/yast2-mail.spec.in Wed Sep 12 15:21:52 2007 @@ -14,14 +14,14 @@ Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_sendmail.ycp Provides: yast2-config-sendmail yast2-config-sendmail-devel Obsoletes: yast2-config-sendmail yast2-config-sendmail-devel -Provides: yast2-trans-sendmail -Obsoletes: yast2-trans-sendmail -Provides: yast2-config-mail -Obsoletes: yast2-config-mail -Provides: yast2-trans-mail -Obsoletes: yast2-trans-mail -Provides: yast2-mail-server -Obsoletes: yast2-mail-server +Provides: yast2-trans-sendmail = %{version} +Obsoletes: yast2-trans-sendmail <= %{version} +Provides: yast2-config-mail = %{version} +Obsoletes: yast2-config-mail <= %{version} +Provides: yast2-trans-mail = %{version} +Obsoletes: yast2-trans-mail <= %{version} +Provides: yast2-mail-server = %{version} +Obsoletes: yast2-mail-server <= %{version} Conflicts: aaa_base < 10.3 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org