Author: aschnell Date: Tue Feb 21 14:42:09 2012 New Revision: 67496 URL: http://svn.opensuse.org/viewcvs/yast?rev=67496&view=rev Log: - use correct CloseDialog - cleanup Modified: trunk/s390/src/clients/dasd_proposal.ycp trunk/s390/src/clients/inst_dasd.ycp trunk/s390/src/clients/inst_zfcp.ycp trunk/s390/src/clients/zfcp_proposal.ycp Modified: trunk/s390/src/clients/dasd_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd_proposal.ycp?rev=67496&r1=67495&r2=67496&view=diff ============================================================================== --- trunk/s390/src/clients/dasd_proposal.ycp (original) +++ trunk/s390/src/clients/dasd_proposal.ycp Tue Feb 21 14:42:09 2012 @@ -6,9 +6,7 @@ * * Proposal function dispatcher for dasd configuration. */ - { - textdomain "s390"; import "DASDController"; @@ -22,7 +20,7 @@ if ( func == "MakeProposal" ) { list summary = DASDController::Summary(); - if (size (summary) == 0) + if (isempty(summary)) // text for installation summary summary = [ _("No DASD disk detected") ]; // Fill return map @@ -37,7 +35,7 @@ { Wizard::CreateDialog (); any sequence = WFM::CallFunction ("inst_dasd", []); - UI::CloseDialog (); + Wizard::CloseDialog (); // Fill return map ret = $[ "workflow_sequence" : sequence @@ -63,7 +61,4 @@ } return ret; - -/* EOF */ } - Modified: trunk/s390/src/clients/inst_dasd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/inst_dasd.ycp?rev=67496&r1=67495&r2=67496&view=diff ============================================================================== --- trunk/s390/src/clients/inst_dasd.ycp (original) +++ trunk/s390/src/clients/inst_dasd.ycp Tue Feb 21 14:42:09 2012 @@ -8,33 +8,19 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("DASD installation module started"); include "s390/dasd/wizards.ycp"; -/* main ui function */ -any ret = nil; - -//ret = CommandLine::Run(cmdline_description); -ret = MainDASDSequence (); +any ret = MainDASDSequence(); y2debug("ret=%1", ret); -/* Finish */ y2milestone("DASD installation module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/clients/inst_zfcp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/inst_zfcp.ycp?rev=67496&r1=67495&r2=67496&view=diff ============================================================================== --- trunk/s390/src/clients/inst_zfcp.ycp (original) +++ trunk/s390/src/clients/inst_zfcp.ycp Tue Feb 21 14:42:09 2012 @@ -8,33 +8,19 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("ZFCP installation module started"); include "s390/zfcp/wizards.ycp"; -/* main ui function */ -any ret = nil; - -//ret = CommandLine::Run(cmdline_description); -ret = MainZFCPSequence (); +any ret = MainZFCPSequence(); y2debug("ret=%1", ret); -/* Finish */ y2milestone("ZFCP module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/clients/zfcp_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp_proposal.ycp?rev=67496&r1=67495&r2=67496&view=diff ============================================================================== --- trunk/s390/src/clients/zfcp_proposal.ycp (original) +++ trunk/s390/src/clients/zfcp_proposal.ycp Tue Feb 21 14:42:09 2012 @@ -6,9 +6,7 @@ * * Proposal function dispatcher for zfcp configuration. */ - { - textdomain "s390"; import "ZFCPController"; @@ -22,7 +20,7 @@ if ( func == "MakeProposal" ) { list summary = ZFCPController::Summary(); - if (size (summary) == 0) + if (isempty(summary)) // text for installation summary summary = [ _("No zFCP device configured") ]; // Fill return map @@ -37,7 +35,7 @@ { Wizard::CreateDialog (); any sequence = WFM::CallFunction ("inst_zfcp", []); - UI::CloseDialog (); + Wizard::CloseDialog (); // Fill return map ret = $[ "workflow_sequence" : sequence @@ -63,7 +61,4 @@ } return ret; - -/* EOF */ } - -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org