Mailinglist Archive: yast-commit (396 mails)

< Previous Next >
[yast-commit] r65334 - in /branches/SuSE-Code-11-SP2-Branch/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
Author: jsuchome
Date: Fri Aug 12 15:33:30 2011
New Revision: 65334

URL: http://svn.opensuse.org/viewcvs/yast?rev=65334&view=rev
Log:
- ignore bootinclude packages during the check what is available
- 2.17.43


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_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=65334&r1=65333&r2=65334&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION (original)
+++ branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION Fri Aug 12
15:33:30 2011
@@ -1 +1 @@
-2.17.42
+2.17.43

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=65334&r1=65333&r2=65334&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
Fri Aug 12 15:33:30 2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Aug 12 15:21:48 CEST 2011 - jsuchome@xxxxxxx
+
+- ignore bootinclude packages during the check what is available
+- 2.17.43
+
+-------------------------------------------------------------------
Wed Aug 3 12:44:08 CEST 2011 - jsuchome@xxxxxxx

- added support for 'bootinclude' tag (fate#310978)

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=65334&r1=65333&r2=65334&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 Fri
Aug 12 15:33:30 2011
@@ -1125,9 +1125,16 @@
{
Popup::ShowFeedback (_("Checking packages availability..."),
_("Please wait..."));
list<string> n_a = [];
- foreach (map p, pmap["package"]:[], {
- if (p["name"]:"" != "" && !Pkg::IsAvailable (p["name"]:""))
+
+ list bi_packages = [];
+ map original_pmap = pmap;
+ pmap["package"] = filter (map p, pmap["package"]:[], {
+ if (p["bootinclude"]:"" == "true")
+ bi_packages = add (bi_packages, p);
+ // do not check bootinclude packages
+ else if (p["name"]:"" != "" && !Pkg::IsAvailable (p["name"]:""))
n_a = add (n_a, p["name"]:"");
+ return p["bootinclude"]:"" != "true";
});
Popup::ClearFeedback ();
if (size (n_a) > 0)
@@ -1162,16 +1169,17 @@
UI::CloseDialog ();
if (r == `remove)
{
- KiwiConfig["packages",index,"package"] = filter (map
p, pmap["package"]:[], {
+ KiwiConfig["packages",index,"package"] = filter (map
p, original_pmap["package"]:[], {
return !contains (n_a, p["name"]:"");
});
ret = `removed;
}
if (r == `selection)
{
- map sw_contents = modifyPackageSelection
(KiwiConfig["packages",index]:$[]);
+ map sw_contents = modifyPackageSelection (pmap);
if (sw_contents != nil)
{
+ sw_contents["package"] = union
(sw_contents["package"]:[], bi_packages);
KiwiConfig["packages",index] = sw_contents;
ret = `selection;
}

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages