Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at 2012-03-08 19:46:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-product-creator (Old) and /work/SRC/openSUSE:Factory/.yast2-product-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-product-creator", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-product-creator/yast2-product-creator.changes 2012-03-07 13:46:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-product-creator.new/yast2-product-creator.changes 2012-03-08 19:46:18.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 7 16:30:06 CET 2012 - [email protected] + +- do not discard bootinclude packages after conflict (bnc#750739) +- backup the original version of config.xml (bnc#750989) +- 2.22.4 + +------------------------------------------------------------------- Old: ---- yast2-product-creator-2.22.3.tar.bz2 New: ---- yast2-product-creator-2.22.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.jdzdLv/_old 2012-03-08 19:46:20.000000000 +0100 +++ /var/tmp/diff_new_pack.jdzdLv/_new 2012-03-08 19:46:20.000000000 +0100 @@ -18,7 +18,7 @@ Name: yast2-product-creator -Version: 2.22.3 +Version: 2.22.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-product-creator-2.22.3.tar.bz2 -> yast2-product-creator-2.22.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.22.3/VERSION new/yast2-product-creator-2.22.4/VERSION --- old/yast2-product-creator-2.22.3/VERSION 2012-03-07 09:18:23.000000000 +0100 +++ new/yast2-product-creator-2.22.4/VERSION 2012-03-07 16:30:23.000000000 +0100 @@ -1 +1 @@ -2.22.3 +2.22.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.22.3/src/Kiwi.ycp new/yast2-product-creator-2.22.4/src/Kiwi.ycp --- old/yast2-product-creator-2.22.3/src/Kiwi.ycp 2012-02-27 15:46:32.000000000 +0100 +++ new/yast2-product-creator-2.22.4/src/Kiwi.ycp 2012-03-07 16:31:27.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Data for kiwi configuration, input and output functions. * Authors: Jiri Suchomel <[email protected]> * - * $Id: Kiwi.ycp 67511 2012-02-22 12:25:45Z jsuchome $ + * $Id: Kiwi.ycp 67570 2012-03-07 08:37:11Z jsuchome $ */ { module "Kiwi"; @@ -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; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.22.3/src/kiwi_dialogs.ycp new/yast2-product-creator-2.22.4/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.22.3/src/kiwi_dialogs.ycp 2012-03-06 17:30:40.000000000 +0100 +++ new/yast2-product-creator-2.22.4/src/kiwi_dialogs.ycp 2012-03-07 16:18:33.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Dialogs for kiwi configuration * Authors: Jiri Suchomel <[email protected]> * - * $Id: kiwi_dialogs.ycp 67511 2012-02-22 12:25:45Z jsuchome $ + * $Id: kiwi_dialogs.ycp 67570 2012-03-07 08:37:11Z jsuchome $ */ { textdomain "product-creator"; @@ -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: [email protected] For additional commands, e-mail: [email protected]
