Author: jsuchome Date: Mon Jan 25 20:03:05 2010 New Revision: 60526 URL: http://svn.opensuse.org/viewcvs/yast?rev=60526&view=rev Log: - when package cannot be installed, look if it is not provided by something else (bnc#571694) - if primary tag for the boot images is not defined, take the first one (bnc#572727) - 2.19.2 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/dialogs.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/routines.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=60526&r1=60525&r2=60526&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Mon Jan 25 20:03:05 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=60526&r1=60525&r2=60526&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Mon Jan 25 20:03:05 2010 @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 25 19:41:02 CET 2010 - jsuchome@suse.cz + +- when package cannot be installed, look if it is not provided + by something else (bnc#571694) +- if primary tag for the boot images is not defined, take the first + one (bnc#572727) +- 2.19.2 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?rev=60526&r1=60525&r2=60526&view=diff ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Mon Jan 25 20:03:05 2010 @@ -1342,7 +1342,20 @@ { foreach(string p, packages, { - y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p)); + boolean selected = Pkg::PkgInstall(p); + y2milestone("selecting package for installation: %1 -> %2", p, selected); + if (!selected) + { + list <list> provides = Pkg::PkgQueryProvides (p); + provides = filter (list l, provides, { + return l[1]:`NONE != `NONE; + }); + string pp = provides[0,0]:""; + if (pp != "") + { + y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); + } + } }); } Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=60526&r1=60525&r2=60526&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Mon Jan 25 20:03:05 2010 @@ -2075,14 +2075,12 @@ UI::ChangeWidget(`id(`out_dir), `Value, Config["iso-directory"]:""); update_repo_table (); list type_its = supported_images != "template" ? default_type_items: []; - boolean primary = false; + kiwi_task = ""; foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { string type = typemap[content_key]:""; - if (!primary) + if (typemap["primary"]:"false" == "true" || kiwi_task == "") kiwi_task = type; - if (typemap["primary"]:"false" == "true") - primary = true; if ((supported_images == "" && !contains (present_types, type)) || supported_images == "template") { @@ -2091,6 +2089,11 @@ present_types = union (present_types, [type]); } }); + if (kiwi_task == "") + { + kiwi_task = "iso"; + y2warning ("no task found, setting to 'iso'"); + } UI::ChangeWidget (`id (`type), `Items, type_its); UI::ChangeWidget (`id (`type), `Value, kiwi_task); return true; Modified: trunk/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/routines.ycp?rev=60526&r1=60525&r2=60526&view=diff ============================================================================== --- trunk/product-creator/src/routines.ycp (original) +++ trunk/product-creator/src/routines.ycp Mon Jan 25 20:03:05 2010 @@ -38,12 +38,20 @@ // get the primary value of image type to be built ('type' from 'preferences') string get_current_task (map config) { - string task = "iso"; + string task = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { - task = typemap[Kiwi::content_key]:task; + if (task == "") // take the 1st one if none is default + task = typemap[Kiwi::content_key]:task; if (typemap["primary"]:"false" == "true") + { + task = typemap[Kiwi::content_key]:task; break; + } }); + if (task == "") + { + y2milestone ("no task found, setting to 'iso'"); + } return task; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org