Author: jsuchome Date: Wed Mar 7 09:37:11 2012 New Revision: 67570 URL: http://svn.opensuse.org/viewcvs/yast?rev=67570&view=rev Log: - new check for conflicting delete packages (bnc#748488) - allow writing empty package list (bnc#749029) - 2.22.3 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=67570&r1=67569&r2=67570&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Mar 7 09:37:11 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 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=67570&r1=67569&r2=67570&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Mar 7 09:37:11 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 7 09:18:05 CET 2012 - jsuchome@suse.cz + +- new check for conflicting delete packages (bnc#748488) +- allow writing empty package list (bnc#749029) +- 2.22.3 + +------------------------------------------------------------------- Wed Feb 22 13:19:58 CET 2012 - jsuchome@suse.cz - do not show duplicates in locale entry (bnc#748122) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=67570&r1=67569&r2=67570&view=diff ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Wed Mar 7 09:37:11 2012 @@ -417,7 +417,6 @@ size (packagemap["package"]:[]) == 0) { y2milestone ("no patterns/packages in %1", packagemap); - return; } image_contents = image_contents + MapAny2XML ("packages", packagemap, 1) + "\n"; Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=67570&r1=67569&r2=67570&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Mar 7 09:37:11 2012 @@ -382,9 +382,54 @@ } /** + * check the conflicts between packages selected and marked for deletion (fate#305254) + * @param packages_before map of packages already selected before entering package selector + */ + define boolean CheckForDeletedPackages (map packages_before) { + + y2milestone ("checking list of selected packages..."); + StoreSWDelete ("delete_sw", $[]); + map to_delete = $[]; + foreach (map pmap, KiwiConfig["packages"]:[], { + string type = pmap["type"]:""; + if (type == "delete") + { + to_delete = listmap (map pacmap, pmap["package"]:[], ``( + $[ pacmap["name"]:"" : true ]) + ); + } + }); + boolean conflicting = false; + if (size (to_delete) > 0) + { + foreach (map package, Pkg::ResolvableProperties("", `package, ""), { + if (conflicting) + break; + string name = package["name"]:""; + // only look at packages selected in last package selector run + if (package["status"]:nil == `selected && !haskey (packages_before, name)) + { + symbol transact_by = package["transact_by"]:`none; + if (transact_by == `solver || transact_by == `user || transact_by == `app_high) + { + if (haskey (to_delete, name)) + { + y2milestone ("packege %1 selected by %2 is present in the delete list", + name, transact_by); + conflicting = true; + } + } + } + }); + } + return conflicting; + } + + /** * Handler for software selection */ define symbol HandleSWSelection (string key, map event) { + if (event["ID"]:nil == key) { integer package_set = KiwiConfig["package_set"]:0; @@ -396,10 +441,12 @@ } map sw_contents = KiwiConfig["packages",package_set]:$[]; + map packages_before = $[]; // separate bootinclude packages from normal ones list bi_packages = []; sw_contents["package"] = filter (map p, sw_contents["package"]:[], { + packages_before[p["name"]:""] = true; if (p["bootinclude"]:"" == "true") bi_packages = add (bi_packages, p); return p["bootinclude"]:"" != "true"; @@ -411,7 +458,18 @@ } else { - sw_contents = modifyPackageSelection (sw_contents); + boolean again = true; + while (again) + { + sw_contents = modifyPackageSelection (sw_contents); + again = CheckForDeletedPackages (packages_before); + if (again && Popup::YesNo (_("Some of the packages that are selected for installation +are also included in the list for deletion. +Continue anyway?"))) + { + again = false; + } + } } if (sw_contents != nil && bi_packages != nil) @@ -1308,6 +1366,7 @@ return ret; } + /** * handler for main action: create the iso image with kiwi */ @@ -1315,45 +1374,6 @@ if (event["ID"]:nil != `next) return true; - // check the conflicts between packages selected and marked for deletion (fate#305254) - y2milestone ("checking list of selected packages..."); - map to_delete = $[]; - foreach (map pmap, KiwiConfig["packages"]:[], { - string type = pmap["type"]:""; - if (type == "delete") - { - to_delete = listmap (map pacmap, pmap["package"]:[], ``( - $[ pacmap["name"]:"" : true ]) - ); - } - }); - boolean conflicting = false; - if (size (to_delete) > 0) - { - foreach (map package, Pkg::ResolvableProperties("", `package, ""), { - if (conflicting) - break; - if (package["status"]:nil == `selected) - { - symbol transact_by = package["transact_by"]:`none; - string name = package["name"]:""; - if (transact_by == `solver || transact_by == `user || transact_by == `app_high) - { - if (haskey (to_delete, name)) - { - y2milestone ("packege %1 selected by %2 is present in the delete list", - name, transact_by); - conflicting = true; - } - } - } - }); - } - // yes/no popup - if (conflicting && !Popup::YesNo (_("Some of the packages that are selected for installation -are also included in the list for deletion. -Continue anyway?"))) - return false; boolean ret = true; map question = $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org