Author: locilka Date: Tue Mar 18 18:19:14 2008 New Revision: 45564 URL: http://svn.opensuse.org/viewcvs/yast?rev=45564&view=rev Log: - Fixed writing disabled modules and proposals during the inst_finish run. Added: trunk/installation/src/clients/installation_settings_finish.ycp (contents, props changed) - copied, changed from r45502, trunk/installation/src/clients/inst_installation_settings.ycp Removed: trunk/installation/src/clients/inst_installation_settings.ycp Modified: trunk/installation/package/yast2-installation.changes Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45564&r1=45563&r2=45564&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Mar 18 18:19:14 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 18 18:19:00 CET 2008 - locilka@suse.cz + +- Fixed writing disabled modules and proposals during the + inst_finish run. + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Copied: trunk/installation/src/clients/installation_settings_finish.ycp (from r45502, trunk/installation/src/clients/inst_installation_settings.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/installation_settings_finish.ycp?p2=trunk/installation/src/clients/installation_settings_finish.ycp&p1=trunk/installation/src/clients/inst_installation_settings.ycp&r1=45502&r2=45564&rev=45564&view=diff ============================================================================== --- trunk/installation/src/clients/inst_installation_settings.ycp (original) +++ trunk/installation/src/clients/installation_settings_finish.ycp Tue Mar 18 18:19:14 2008 @@ -1,5 +1,5 @@ /** - * File: clients/inst_installation_settings.ycp + * File: clients/installation_settings_finish.ycp * Package: Installation * Summary: Installation - save settings (used later in second stage, or ...). * See bnc #364066. @@ -15,37 +15,67 @@ import "ProductControl"; import "InstData"; - if (ProductControl::GetDisabledModules() == nil) { - y2error ("Wrong definition of DisabledModules"); - return true; + any ret = nil; + string func = ""; + map param = $[]; + + /* Check arguments */ + if(size(WFM::Args()) > 0 && is (WFM::Args (0), string)) { + func = (string) WFM::Args (0); + if (size (WFM::Args()) > 1 && is (WFM::Args (1), map)) + param = (map) WFM::Args (1); } + y2milestone ("starting installation_settings_finish"); + y2debug("func=%1", func); + y2debug("param=%1", param); + + void Write () { + if (ProductControl::GetDisabledModules() == nil) { + y2error ("Wrong definition of DisabledModules"); + return; + } + + if (InstData::wizardsteps_disabled_modules == nil) { + y2error ("Path to write disabled modules is not defined!"); + return; + } + + y2milestone ( + "Writing disabled modules %1 into %2", + ProductControl::GetDisabledModules(), + InstData::wizardsteps_disabled_modules + ); + + if ((boolean) SCR::Write (.target.ycp, InstData::wizardsteps_disabled_modules, ProductControl::GetDisabledModules()) != true) { + y2error ("Cannot write disabled modules"); + } + + y2milestone ( + "Writing disabled proposals %1 into %2", + ProductControl::GetDisabledProposals(), + InstData::wizardsteps_disabled_proposals + ); + + if ((boolean) SCR::Write (.target.ycp, InstData::wizardsteps_disabled_proposals, ProductControl::GetDisabledProposals()) != true) { + y2error ("Cannot write disabled proposals"); + } - if (InstData::wizardsteps_disabled_modules == nil) { - y2error ("Path to write disabled modules is not defined!"); - return true; + y2milestone ("Anyway, successful"); } - y2milestone ( - "Writing disabled modules %1 into %2", - ProductControl::GetDisabledModules(), - InstData::wizardsteps_disabled_modules - ); - - if ((boolean) SCR::Write (.target.ycp, InstData::wizardsteps_disabled_modules, ProductControl::GetDisabledModules()) != true) { - y2error ("Cannot write disabled modules"); + if (func == "Info") { + ret = (any) $[ + "steps" : 1, + // progress step title + "title" : _("Writing automatic configuration..."), + "when" : [ `installation, `update, `autoinst ], + ]; + } else if (func == "Write") { + Write(); + } else { + y2error ("unknown function: %1", func); + ret = nil; } - y2milestone ( - "Writing disabled proposals %1 into %2", - ProductControl::GetDisabledProposals(), - InstData::wizardsteps_disabled_proposals - ); - - if ((boolean) SCR::Write (.target.ycp, InstData::wizardsteps_disabled_proposals, ProductControl::GetDisabledProposals()) != true) { - y2error ("Cannot write disabled proposals"); - } - - y2milestone ("Anyway, successful"); - - return true; + return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org