Hello community,
here is the log from the commit of package yast2-product-creator for
openSUSE:Factory
checked in at Mon Aug 15 10:57:29 CEST 2011.
--------
--- yast2-product-creator/yast2-product-creator.changes 2011-08-05
16:15:31.000000000 +0200
+++
/mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes
2011-08-12 15:33:55.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 12 15:24:09 CEST 2011 - [email protected]
+
+- ignore bootinclude packages during the check what is available
+- 2.21.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.21.6.tar.bz2
New:
----
yast2-product-creator-2.21.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.A9C9GJ/_old 2011-08-15 10:49:11.000000000 +0200
+++ /var/tmp/diff_new_pack.A9C9GJ/_new 2011-08-15 10:49:11.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-product-creator
-Version: 2.21.6
+Version: 2.21.7
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.21.6.tar.bz2
+Source0: yast2-product-creator-2.21.7.tar.bz2
Prefix: /usr
@@ -62,7 +62,7 @@
XEN images etc.), based on existing installation sources.
%prep
-%setup -n yast2-product-creator-2.21.6
+%setup -n yast2-product-creator-2.21.7
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-product-creator-2.21.6.tar.bz2 ->
yast2-product-creator-2.21.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.6/VERSION
new/yast2-product-creator-2.21.7/VERSION
--- old/yast2-product-creator-2.21.6/VERSION 2011-08-05 16:13:59.000000000
+0200
+++ new/yast2-product-creator-2.21.7/VERSION 2011-08-12 15:26:07.000000000
+0200
@@ -1 +1 @@
-2.21.6
+2.21.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.6/src/kiwi_dialogs.ycp
new/yast2-product-creator-2.21.7/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.21.6/src/kiwi_dialogs.ycp 2011-08-05
16:13:20.000000000 +0200
+++ new/yast2-product-creator-2.21.7/src/kiwi_dialogs.ycp 2011-08-12
15:23:44.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel <[email protected]>
*
- * $Id: kiwi_dialogs.ycp 64094 2011-05-24 08:34:00Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 65252 2011-08-05 14:15:04Z jsuchome $
*/
{
textdomain "product-creator";
@@ -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;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
