Author: jsuchome
Date: Mon Jun 22 11:42:11 2009
New Revision: 57674
URL: http://svn.opensuse.org/viewcvs/yast?rev=57674&view=rev
Log:
- do not show "compression" widget for ext3 filesystems (bnc#510833)
- 2.17.21
Modified:
branches/SuSE-Code-11-Branch/product-creator/VERSION
branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes
branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp
branches/SuSE-Code-11-Branch/product-creator/yast2-product-creator.spec.in
Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/VERSION?rev=57674&r1=57673&r2=57674&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/VERSION (original)
+++ branches/SuSE-Code-11-Branch/product-creator/VERSION Mon Jun 22 11:42:11 2009
@@ -1 +1 @@
-2.17.20
+2.17.21
Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes?rev=57674&r1=57673&r2=57674&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original)
+++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Mon Jun 22 11:42:11 2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Jun 22 11:28:49 CEST 2009 - jsuchome@suse.cz
+
+- do not show "compression" widget for ext3 filesystems (bnc#510833)
+- 2.17.21
+
+-------------------------------------------------------------------
Thu Jun 11 16:37:39 CEST 2009 - jsuchome@suse.cz
- do not forget to close opened windows on error (bnc#511436)
Modified: branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp?rev=57674&r1=57673&r2=57674&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp (original)
+++ branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Mon Jun 22 11:42:11 2009
@@ -1359,7 +1359,18 @@
// it is a function, to be able to adapt to actual state)
map tabs_descr () {
- return $[
+ boolean show_compression = true;
+
+ // compression not allowed in most cases (bnc#510833)
+ foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], {
+ if (typemap[content_key]:"" == kiwi_task)
+ {
+ if (typemap["filesystem"]:"" == "ext3")
+ show_compression = false;
+ }
+ });
+
+ map ret = $[
"config.xml" : $[
// tab header
"header" : _("Image Configuration"),
@@ -1374,7 +1385,7 @@
"additive"
)
)),
- `HWeight (1, "compression")
+ show_compression ? `HWeight (1, "compression") : `HBox ()
),
`HBox (
`HWeight (2, `VBox (
@@ -1389,7 +1400,7 @@
), `HSpacing(1)),
"widget_names" : [
"version",
- "size", "sizeunit", "additive", "compression",
+ "size", "sizeunit", "additive",
"sw_selection",
"rt_sw", "configure_sw",
"delete_sw",
@@ -1477,6 +1488,10 @@
],
],
];
+ if (show_compression)
+ ret["config.xml","widget_names"] = add (
+ ret["config.xml","widget_names"]:[], "compression");
+ return ret;
}
map