Author: jsuchome Date: Wed Mar 7 16:32:12 2012 New Revision: 67585 URL: http://svn.opensuse.org/viewcvs/yast?rev=67585&view=rev Log: - do not discard bootinclude packages after conflict (bnc#750739) - backup the original version of config.xml (bnc#750989) - 2.22.4 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=67585... ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Mar 7 16:32:12 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pro... ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Mar 7 16:32:12 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 7 16:30:06 CET 2012 - jsuchome@suse.cz + +- do not discard bootinclude packages after conflict (bnc#750739) +- backup the original version of config.xml (bnc#750989) +- 2.22.4 + +------------------------------------------------------------------- Wed Mar 7 09:18:05 CET 2012 - jsuchome@suse.cz - new check for conflicting delete packages (bnc#748488) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=... ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Wed Mar 7 16:32:12 2012 @@ -294,8 +294,8 @@ { string backup = base_path + "/config.xml.POSsave"; y2milestone ("creating backup of config file: %1", backup); - SCR::Execute (.target.bash, sformat ("cp -- '%1' '%2'", - String::Quote (file_path), String::Quote (backup))); + SCR::Execute (.target.bash, sformat ("cp -- '%1/config.xml' '%2'", + String::Quote (base_path), String::Quote (backup))); } file_path = slepos_path; } Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.... ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Mar 7 16:32:12 2012 @@ -1343,16 +1343,30 @@ ProductCreator::MarkTaboo (maplist (map i, pmap["ignore"]:[], ``(i["name"]:""))); - foreach (map p, KiwiConfig["packages",index,"package"]:[], { + // remember bootinclude packages: in Package selector we will lose this information (bnc#750739) + map bi_packages = $[]; + foreach (map p, KiwiConfig["packages",index,"package"]:[], { + if (p["bootinclude"]:"" == "true") + { + bi_packages[p["name"]:""] = true; + } InstallPackageOrProvider (p["name"]:""); - }); - + }); boolean solved = Pkg::PkgSolve (true); if (!solved) { map sw_contents = modifyPackageSelection (KiwiConfig["packages",index]:$[]); if (sw_contents != nil) { + sw_contents["package"] = maplist (map p, sw_contents["package"]:[], { + string name = p["name"]:""; + if (bi_packages[name]:false) + { + y2milestone ("package %1 was marked as bootinclude", name); + p["bootinclude"] = "true"; + } + return p; + }); KiwiConfig["packages",index] = sw_contents; } else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org