[yast-commit] r46985 - in /trunk/packager: package/yast2-packager.changes src/modules/Packages.ycp src/modules/SlideShow.ycp

Author: lslezak Date: Wed Apr 23 15:17:53 2008 New Revision: 46985 URL: http://svn.opensuse.org/viewcvs/yast?rev=46985&view=rev Log: - do not check product category (it is obsoleted), install all products (bnc#359538) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp trunk/packager/src/modules/SlideShow.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=46985&r1=46984&r2=46985&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Apr 23 15:17:53 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 23 15:05:22 CEST 2008 - lslezak@suse.cz + +- do not check product category (it is obsoleted), install all + products (bnc#359538) + +------------------------------------------------------------------- Mon Apr 21 14:17:55 CEST 2008 - locilka@suse.cz - Added new function DefaultDesktop::SelectedDesktops() to list all Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=46985&r1=46984&r2=46985&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Apr 23 15:17:53 2008 @@ -1314,14 +1314,13 @@ global boolean SelectProduct () { Packages::Initialize (true); list > products = Pkg::ResolvableProperties ("", `product, ""); - products = filter (map p, products, { - return p["category"]:"" == "base"; - }); + if (size (products) == 0) { - y2milestone ("No base product found on media"); + y2milestone ("No product found on media"); return true; } + list >selected_products = filter (map p, products, { return p["status"]:nil == `selected; }); @@ -1335,6 +1334,7 @@ ret = Pkg::ResolvableInstall (p["name"]:"", `product) && ret; }); } + return ret; } Modified: trunk/packager/src/modules/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShow.ycp?rev=46985&r1=46984&r2=46985&view=diff ============================================================================== --- trunk/packager/src/modules/SlideShow.ycp (original) +++ trunk/packager/src/modules/SlideShow.ycp Wed Apr 23 15:17:53 2008 @@ -1484,6 +1484,8 @@ `HSpacing( 0.5 ) ); + y2milestone("total_size_to_install: %1", total_size_to_install); + y2debug( "widget term: \n%1", widgets ); return widgets; } @@ -1749,6 +1751,7 @@ total_size_to_install = ListSum( flatten( total_sizes_per_cd_per_src ) ); + y2milestone("total_size_to_install: %1", total_size_to_install); remaining_sizes_per_cd_per_src = (list) eval (total_sizes_per_cd_per_src); remaining_pkg_count_per_cd_per_src = (list) eval (total_pkg_count_per_cd_per_src); total_cd_count = size( flatten( total_sizes_per_cd_per_src ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org