Author: lslezak Date: Wed Jan 6 20:10:25 2010 New Revision: 60245 URL: http://svn.opensuse.org/viewcvs/yast?rev=60245&view=rev Log: - do not reselect patterns which have been deselected by user (bnc#450786, bnc#471340) - 2.19.2 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=60245&r1=60244&r2=60245&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Jan 6 20:10:25 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=60245&r1=60244&r2=60245&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jan 6 20:10:25 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 6 17:48:18 UTC 2010 - lslezak@suse.cz + +- do not reselect patterns which have been deselected by user + (bnc#450786, bnc#471340) +- 2.19.2 + +------------------------------------------------------------------- Mon Jan 4 16:18:08 CET 2010 - locilka@suse.cz - Fixed accepting/declining the multilicense agreement. Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=60245&r1=60244&r2=60245&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Jan 6 20:10:25 2010 @@ -1649,7 +1649,15 @@ { y2milestone ("Selecting system patterns %1", system_patterns); foreach (string p, system_patterns, { - Pkg::ResolvableInstall (p, `pattern); + map prop = Pkg::ResolvableProperties(p, `pattern, "")[0]:$[]; + if (prop["status"]:nil == `available && prop["transact_by"]:nil == `user) + { + y2milestone("Ignoring deselected pattern '%1'", p); + } + else + { + Pkg::ResolvableInstall (p, `pattern); + } }); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org