Author: locilka Date: Mon Jan 26 16:54:09 2009 New Revision: 55039 URL: http://svn.opensuse.org/viewcvs/yast?rev=55039&view=rev Log: - Added new client inst_add-on_software providing the functionality to open package selector in a desired mode (and optionally to install the selected software) (bnc #469320). - 2.17.16 Added: branches/SuSE-Code-11-Branch/add-on/src/inst_add-on_software.ycp Modified: branches/SuSE-Code-11-Branch/add-on/VERSION branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-Branch/add-on/src/Makefile.am branches/SuSE-Code-11-Branch/add-on/yast2-add-on.spec.in Modified: branches/SuSE-Code-11-Branch/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/VERSION?rev=55039&r1=55038&r2=55039&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/VERSION (original) +++ branches/SuSE-Code-11-Branch/add-on/VERSION Mon Jan 26 16:54:09 2009 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes?rev=55039&r1=55038&r2=55039&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes Mon Jan 26 16:54:09 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jan 26 16:51:09 CET 2009 - locilka@suse.cz + +- Added new client inst_add-on_software providing the functionality + to open package selector in a desired mode (and optionally to + install the selected software) (bnc #469320). +- 2.17.16 + +------------------------------------------------------------------- Fri Jan 23 16:40:01 CET 2009 - locilka@suse.cz - Fixed displaying repository information for add-on products Modified: branches/SuSE-Code-11-Branch/add-on/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/src/Makefile.am?rev=55039&r1=55038&r2=55039&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/src/Makefile.am (original) +++ branches/SuSE-Code-11-Branch/add-on/src/Makefile.am Mon Jan 26 16:54:09 2009 @@ -8,7 +8,8 @@ add-on_proposal.ycp \ inst_add-on.ycp \ inst_language_add-on.ycp \ - vendor.ycp + vendor.ycp \ + inst_add-on_software.ycp ynclude_DATA = \ add-on-workflow.ycp \ Added: branches/SuSE-Code-11-Branch/add-on/src/inst_add-on_software.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/src/inst_add-on_software.ycp?rev=55039&view=auto ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/src/inst_add-on_software.ycp (added) +++ branches/SuSE-Code-11-Branch/add-on/src/inst_add-on_software.ycp Mon Jan 26 16:54:09 2009 @@ -0,0 +1,102 @@ +/** + * File: inst_add-on_software.ycp + * + * Client providing the software overview/selection to be used + * in add-on products (their control files). If not set otherwise, + * (skip_installation), it also installs the selected resolvables + * and calls SuSEconfig. + * + * Control File Example (installation.xml): + * <workflows config:type="list"> + * <workflow> + * <stage>normal</stage> + * <mode>installation,normal</mode> + * <modules config:type="list"> + * ... + * <module> + * <label>Software Selection</label> + * <name>inst_add-on_software</name> + * <arguments> + * + * <!-- + * Mode in which the Packager dialog opens up. See Available Modes. + * The defalt mode is "patterns" if not set + * --> + * patterns + * + * <!-- + * If set to "yes", packages (patterns/...) will not be installed + * automatically. Default is "no" (packages will get installed). + * --> + * true + * + * </arguments> + * </module> + * ... + * </modules> + * </workflow> + * </workflows> + * + * Available Modes: + * o patterns - list of all available (installed/selected/...) patterns + * o search - dialog capable of searching through packages + * o summary - installation summary + * o repositories - list of enabled repositories (including the @System) + * + * See also BNC #469320 + */ +{ + import "PackagesUI"; + import "GetInstArgs"; + import "ProductControl"; + import "ProductFeatures"; + import "Installation"; + + if (GetInstArgs::going_back()) { + return `auto; + } + + map argmap = GetInstArgs::argmap(); + y2milestone ("Client called with args: %1", argmap); + + // Mapping of modes + // module->arguments->sw_mode : UI_mode + map modes = $[ + "patterns" : `patternSelector, + "search" : `searchMode, + "summary" : `summaryMode, + "repositories" : `repoMode, + ]; + + // For sure + Pkg::TargetInit (Installation::destdir, false); + Pkg::SourceStartManager (true); + + string pcg_mode = argmap["sw_mode"]:"patterns"; + symbol run_in_mode = modes[pcg_mode]:`summaryMode; + y2milestone ("Running package selector in mode %1/%2", pcg_mode, run_in_mode); + + // Call the package selector + // Since yast2 >= 2.17.58 + symbol ret = PackagesUI::RunPackageSelector ($["mode":run_in_mode]); + y2milestone ("RunPackageSelector returned %1", ret); + + symbol dialog_ret = `next; + + if (ret == `accept || ret == `ok) { + // Add-on requires packages to be installed right now + if (argmap["skip_installation"]:false != true) { + y2milestone ("Selected resolvables will be installed now"); + + if (WFM::CallFunction ("inst_rpmcopy", [GetInstArgs::Buttons (false, false)]) == `abort) { + dialog_ret = `abort; + } else if (WFM::CallFunction ("inst_suseconfig", [GetInstArgs::Buttons (false, false)]) == `abort) { + dialog_ret = `abort; + } else { + y2milestone ("Done"); + } + } + } + + return dialog_ret; +} Modified: branches/SuSE-Code-11-Branch/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/yast2-add-on.spec.in?rev=55039&r1=55038&r2=55039&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/yast2-add-on.spec.in (original) +++ branches/SuSE-Code-11-Branch/add-on/yast2-add-on.spec.in Mon Jan 26 16:54:09 2009 @@ -2,8 +2,8 @@ @HEADER@ Requires: autoyast2-installation -# WorkflowManager module -Requires: yast2 >= 2.15.22 +# PackagesUI module, BNC #469320 +Requires: yast2 >= 2.15.58 Requires: yast2-installation Requires: yast2-country -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org