Mailinglist Archive: yast-commit (126 mails)

< Previous Next >
[yast-commit] r67583 - in /branches/SuSE-Code-11-SP2-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
Author: jsuchome
Date: Wed Mar 7 16:29:54 2012
New Revision: 67583

URL: http://svn.opensuse.org/viewcvs/yast?rev=67583&view=rev
Log:
- do not discard bootinclude packages after conflict (bnc#750739)
- backup the original version of config.xml (bnc#750989)
- 2.17.49


Modified:
branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION

branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes
branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp
branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp

Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION?rev=67583&r1=67582&r2=67583&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION (original)
+++ branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION Wed Mar 7
16:29:54 2012
@@ -1 +1 @@
-2.17.48
+2.17.49

Modified:
branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes?rev=67583&r1=67582&r2=67583&view=diff
==============================================================================
---
branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes
(original)
+++
branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes
Wed Mar 7 16:29:54 2012
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Mar 7 16:19:01 CET 2012 - jsuchome@xxxxxxx
+
+- do not discard bootinclude packages after conflict (bnc#750739)
+- backup the original version of config.xml (bnc#750989)
+- 2.17.49
+
+-------------------------------------------------------------------
Tue Mar 6 17:32:14 CET 2012 - jsuchome@xxxxxxx

- new check for conflicting delete packages (bnc#748488)

Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp?rev=67583&r1=67582&r2=67583&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp Wed Mar 7
16:29:54 2012
@@ -274,8 +274,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: branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp?rev=67583&r1=67582&r2=67583&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp
(original)
+++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Wed
Mar 7 16:29:54 2012
@@ -1323,16 +1323,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@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages