Author: lslezak Date: Fri Mar 14 15:00:04 2008 New Revision: 45463 URL: http://svn.opensuse.org/viewcvs/yast?rev=45463&view=rev Log: - added support for starting the repository manager from the package manager (fate#302517) - 2.16.26 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp trunk/packager/src/clients/sw_single.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=45463&r1=45462&r2=45463&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Mar 14 15:00:04 2008 @@ -1 +1 @@ -2.16.25 +2.16.26 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=45463&r1=45462&r2=45463&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Mar 14 15:00:04 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 14 14:55:17 CET 2008 - lslezak@suse.cz + +- added support for starting the repository manager from + the package manager (fate#302517) +- 2.16.26 + +------------------------------------------------------------------- Fri Mar 14 14:44:37 CET 2008 - juhliarik@suse.cz - added calling inst_bootloader from inst_kickoff (FATE #302660) Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=45463&r1=45462&r2=45463&view=diff ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Fri Mar 14 15:00:04 2008 @@ -42,6 +42,8 @@ include "packager/inst_source_dialogs.ycp"; include "packager/key_manager_dialogs.ycp"; + boolean full_mode = false; + integer numSources = 0; list > sourceStatesIn = []; @@ -657,7 +659,15 @@ "); } - Wizard::SetNextButton(`next, Label::FinishButton() ); + if (full_mode) + { + Wizard::SetNextButton(`next, Label::OKButton() ); + } + else + { + Wizard::SetNextButton(`next, Label::FinishButton() ); + } + Wizard::SetContents(title, contents, help_text, false, true); Wizard::DisableBackButton(); @@ -809,6 +819,13 @@ else if ( input == `refresh ) { Pkg::SourceRefreshNow (id); + + if (full_mode && sourceState["enabled"]:false) + { + // force loading of the resolvables + Pkg::SourceSetEnabled(id, false); + Pkg::SourceSetEnabled(id, true); + } } else if ( input == `autorefresh_all || input == `refresh_enabled) { @@ -858,6 +875,13 @@ Pkg::SourceRefreshNow(srcid); + if (full_mode && src_state["enabled"]:false) + { + // force loading of the resolvables + Pkg::SourceSetEnabled(srcid, false); + Pkg::SourceSetEnabled(srcid, true); + } + Progress::NextStep(); } else @@ -891,6 +915,11 @@ UI::ChangeWidget( `id( `table ), `Item( current, 0 ), newstate ); sourceState[ "enabled" ] = state; sourceStatesOut[ current ] = sourceState; + + if (full_mode) + { + Pkg::SourceSetEnabled(sourceState["SrcId"]:-1, state); + } } else if ( input == `autorefresh) { @@ -1144,6 +1173,21 @@ "guihandler" : StartInstSource, ]; +if (WFM::Args() == [ `sw_single_mode ]) +{ + y2internal("Started from sw_single, switching the mode"); + + full_mode = true; + boolean progress_state = Progress::set(false); + any ret = StartInstSource(); + + // load objects from the new repositories + Pkg::SourceLoad(); + Progress::set(progress_state); + + return ret; +} + return CommandLine::Run(cmdline_description); } // EOF Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.ycp?rev=45463&r1=45462&r2=45463&view=diff ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Fri Mar 14 15:00:04 2008 @@ -383,6 +383,16 @@ || Pkg::GetPackages(`taboo, true) != taboo_packages; y2milestone("Ask to restart the package selector: %1", ask); } + // start the repository manager + else if (result == `repo_mgr) + { + symbol repo_result = (symbol)WFM::CallFunction( "repositories", [ `sw_single_mode ]); + + if (repo_result != `abort) + { + force_restart = true; + } + } else { // canceled - don't ask again -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org