Mailinglist Archive: yast-commit (135 mails)

< Previous Next >
[yast-commit] r67680 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
Author: jsuchome
Date: Wed Mar 21 14:54:03 2012
New Revision: 67680

URL: http://svn.opensuse.org/viewcvs/yast?rev=67680&view=rev
Log:
- locale settings: remove unsupported entries, allow deleting
(bnc#751588)
- 2.22.5


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=67680&r1=67679&r2=67680&view=diff
==============================================================================
--- trunk/product-creator/VERSION (original)
+++ trunk/product-creator/VERSION Wed Mar 21 14:54:03 2012
@@ -1 +1 @@
-2.22.4
+2.22.5

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=67680&r1=67679&r2=67680&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Wed Mar 21
14:54:03 2012
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Mar 21 14:52:02 CET 2012 - jsuchome@xxxxxxx
+
+- locale settings: remove unsupported entries, allow deleting
+ (bnc#751588)
+- 2.22.5
+
+-------------------------------------------------------------------
Wed Mar 7 16:30:06 CET 2012 - jsuchome@xxxxxxx

- do not discard bootinclude packages after conflict (bnc#750739)

Modified: trunk/product-creator/src/kiwi_dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=67680&r1=67679&r2=67680&view=diff
==============================================================================
--- trunk/product-creator/src/kiwi_dialogs.ycp (original)
+++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Mar 21 14:54:03 2012
@@ -708,14 +708,15 @@
define void InitLocaleCombo (string id) {

string lang = KiwiConfig["preferences",0,id,0,content_key]:"";
- list items = [];
-
+ list items = [
+ `item (`id ("none"), "---", false)
+ ];
if (Kiwi::all_locales == $[])
{
map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/locale
-a");
foreach (string line, splitstring (out["stdout"]:"", "\n"), {
string code = splitstring (line, ".@")[0]:line;
- if (code != "")
+ if (code != "" && code != "C" && code != "POSIX")
Kiwi::all_locales[code] = 1;
});
}
@@ -766,6 +767,7 @@
list items = maplist (string zone, Kiwi::all_timezones, {
return `item (`id (zone), zone, tz == zone);
});
+ items = prepend (items, `item (`id ("none"), "---"));

UI::ChangeWidget (`id (id), `Items, items);
}
@@ -792,12 +794,12 @@
val = split[0]:val;
UI::ChangeWidget (`id (key), `Value, val);
}
- if (val == "" && haskey (KiwiConfig["preferences",0]:$[], key))
+ if ((val == "" || val == "none") && haskey
(KiwiConfig["preferences",0]:$[], key))
{
KiwiConfig["preferences",0] =
remove (KiwiConfig["preferences",0]:$[], key);
}
- else if (val != "")
+ else if (val != "" && val != "none")
{
KiwiConfig["preferences",0,key] = [ $[
content_key : UI::QueryWidget (`id(key), `Value)

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

< Previous Next >
This Thread
  • No further messages