Author: locilka Date: Thu Dec 11 16:29:13 2008 New Revision: 54064 URL: http://svn.opensuse.org/viewcvs/yast?rev=54064&view=rev Log: - Fixed handling of patterns selected by add-ons (by using PackagesProposal module) (bnc #458297). - 2.17.52 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/AddOnProduct.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=54064&r1=54063&r2=54064&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Dec 11 16:29:13 2008 @@ -1 +1 @@ -2.17.51 +2.17.52 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=54064&r1=54063&r2=54064&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Dec 11 16:29:13 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Dec 11 16:27:25 CET 2008 - locilka@suse.cz + +- Fixed handling of patterns selected by add-ons (by using + PackagesProposal module) (bnc #458297). +- 2.17.52 + +------------------------------------------------------------------- Wed Dec 10 15:46:35 CET 2008 - lslezak@suse.cz - fixed duplicating of repositories after editing, fixed comparison Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduct.ycp?rev=54064&r1=54063&r2=54064&view=diff ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Thu Dec 11 16:29:13 2008 @@ -41,6 +41,7 @@ import "Stage"; import "Icon"; import "PackageCallbacks"; +import "PackagesProposal"; // variables for installation with product /** @@ -721,6 +722,11 @@ */ map patterns_preselected_by_addon = $[]; +string PackagesProposalAddonID (integer src_id) { + return sformat ("Add-On-Product-ID:%1", src_id); +} + +// See also DeselectProductPatterns() boolean SelectProductPatterns (string content_file, integer src_id) { if (! FileUtils::Exists (content_file)) { y2error ("No such file: %1", content_file); @@ -750,6 +756,15 @@ // clear/set patterns_preselected_by_addon[src_id] = []; + // bnc #458297 + // Using PackagesProposal to select the patterns itself + PackagesProposal::SetResolvables (PackagesProposalAddonID (src_id), `pattern, patterns_to_select); + + if (Stage::initial()) { + y2milestone ("Using PackagesProposal to select Add-On patterns"); + return true; + } + boolean ret = true; foreach (string one_pattern, patterns_to_select, { @@ -783,7 +798,17 @@ } +// See also SelectProductPatterns() boolean DeselectProductPatterns (integer src_id) { + // bnc #458297 + // Using PackagesProposal to deselect the patterns itself + PackagesProposal::SetResolvables (PackagesProposalAddonID (src_id), `pattern, []); + + if (Stage::initial()) { + y2milestone ("Initial stage, using PackagesProposal to deselect patterns"); + return true; + } + list <string> patterns_to_deselect = patterns_preselected_by_addon[src_id]:[]; if (size (patterns_to_deselect) == 0) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org