Mailinglist Archive: yast-commit (396 mails)

< Previous Next >
[yast-commit] r65333 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
Author: jsuchome
Date: Fri Aug 12 15:33:22 2011
New Revision: 65333

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


Modified:
trunk/product-creator/VERSION
trunk/product-creator/package/yast2-product-creator.changes
trunk/product-creator/src/kiwi_dialogs.ycp

Modified: trunk/product-creator/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=65333&r1=65332&r2=65333&view=diff
==============================================================================
--- trunk/product-creator/VERSION (original)
+++ trunk/product-creator/VERSION Fri Aug 12 15:33:22 2011
@@ -1 +1 @@
-2.21.6
+2.21.7

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=65333&r1=65332&r2=65333&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Fri Aug 12
15:33:22 2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Aug 12 15:24:09 CEST 2011 - jsuchome@xxxxxxx
+
+- ignore bootinclude packages during the check what is available
+- 2.21.7
+
+-------------------------------------------------------------------
Fri Aug 5 16:13:24 CEST 2011 - jsuchome@xxxxxxx

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

Modified: trunk/product-creator/src/kiwi_dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=65333&r1=65332&r2=65333&view=diff
==============================================================================
--- trunk/product-creator/src/kiwi_dialogs.ycp (original)
+++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Aug 12 15:33:22 2011
@@ -479,7 +479,6 @@
define void InitSize (string id) {

map size_map = get_current_size_map (KiwiConfig, kiwi_task);
-
integer siz = tointeger (size_map[Kiwi::content_key]:"0");
if (siz == nil) siz = 0;
UI::ChangeWidget (`id ("size"), `Value, siz);
@@ -1125,9 +1124,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 +1168,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