Author: jsuchome
Date: Tue Jul 14 15:28:37 2009
New Revision: 58045
URL: http://svn.opensuse.org/viewcvs/yast?rev=58045&view=rev
Log:
- do not create i386 version of initrd for s390 (bnc#498464)
- Image Creator: help texts for locale configuration (bnc#515551)
- 2.17.24
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.ycp
branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp
branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp
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=58045&r1=58044&r2=58045&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/VERSION (original)
+++ branches/SuSE-Code-11-Branch/product-creator/VERSION Tue Jul 14 15:28:37 2009
@@ -1 +1 @@
-2.17.23
+2.17.24
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=58045&r1=58044&r2=58045&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 Tue Jul 14 15:28:37 2009
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 14 14:56:33 CEST 2009 - jsuchome@suse.cz
+
+- do not create i386 version of initrd for s390 (bnc#498464)
+- Image Creator: help texts for locale configuration (bnc#515551)
+- 2.17.24
+
+-------------------------------------------------------------------
Fri Jul 10 13:11:25 CEST 2009 - lslezak@suse.cz
- fixed cross-architecture problems (bnc#510971)
Modified: branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp?rev=58045&r1=58044&r2=58045&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp (original)
+++ branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp Tue Jul 14 15:28:37 2009
@@ -590,6 +590,7 @@
*/
global map InitCurrentRepositories () {
+ current_repositories = $[];
Pkg::SourceRestore ();
foreach (map source, Pkg::SourceEditGet (), {
integer srcid = source["SrcId"]:-1;
Modified: branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp?rev=58045&r1=58044&r2=58045&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp (original)
+++ branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp Tue Jul 14 15:28:37 2009
@@ -2256,10 +2256,17 @@
}
}
}
-
+ string arch = GetArch ();
list<string> initrds = splitstring(find_output, "\n");
// remove empty strings
- initrds = filter(string initrd, initrds, {return initrd != "";});
+ initrds = filter (string initrd, initrds, {
+ if (initrd == "")
+ return false;
+ // workaround for bnc#498464
+ if (arch == "s390x" && issubstring (initrd, "boot/i386/"))
+ return false;
+ return true;
+ });
y2milestone("Found initrds: %1", initrds);
boolean ret = true;
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=58045&r1=58044&r2=58045&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 Tue Jul 14 15:28:37 2009
@@ -1784,7 +1784,10 @@
"init" : InitPreferences,
"store" : StorePreferences,
"handle" : HandlePreferences,
- "no_help" : true,
+ // help text for locale (heading)
+ "help" : _("<p><b>Locale Settings</b></p>") +
+ // help text for locale
+ _("<p>The value of <b>Locale</b> (e.g. <tt>en_US</tt>) defines the contents of the RC_LANG variable in <t>/etc/sysconfig/language</tt>.</p>"),
],
"keytable" : $[
"widget" : `textentry,
@@ -1793,7 +1796,8 @@
"init" : InitPreferences,
"store" : StorePreferences,
"handle" : HandlePreferences,
- "no_help" : true,
+ // help text for keytable
+ "help" : _("<p><b>Keyboard layout</b> specifies the name of the console keymap to use. The value (e.g. <tt>us</tt>) corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>.</p>"),
],
"timezone" : $[
"widget" : `textentry,
@@ -1802,7 +1806,8 @@
"init" : InitPreferences,
"store" : StorePreferences,
"handle" : HandlePreferences,
- "no_help" : true,
+ // help text for timezone
+ "help" : _("<p>It is also possible to set a specific <b>Time zone</b>. Available time zones are located in the <tt>/usr/share/zoneinfo</tt> directory.</p>"),
],
// ---------------- widgtes for users tab
"general_users" : $[
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org