Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at 2012-03-22 12:42:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-product-creator (Old) and /work/SRC/openSUSE:Factory/.yast2-product-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-product-creator", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-product-creator/yast2-product-creator.changes 2012-03-08 19:46:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-product-creator.new/yast2-product-creator.changes 2012-03-22 12:42:44.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 21 14:52:02 CET 2012 - [email protected] + +- locale settings: remove unsupported entries, allow deleting + (bnc#751588) +- 2.22.5 + +------------------------------------------------------------------- Old: ---- yast2-product-creator-2.22.4.tar.bz2 New: ---- yast2-product-creator-2.22.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.BkCUh3/_old 2012-03-22 12:42:46.000000000 +0100 +++ /var/tmp/diff_new_pack.BkCUh3/_new 2012-03-22 12:42:46.000000000 +0100 @@ -18,7 +18,7 @@ Name: yast2-product-creator -Version: 2.22.4 +Version: 2.22.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-product-creator-2.22.4.tar.bz2 -> yast2-product-creator-2.22.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.22.4/VERSION new/yast2-product-creator-2.22.5/VERSION --- old/yast2-product-creator-2.22.4/VERSION 2012-03-07 16:30:23.000000000 +0100 +++ new/yast2-product-creator-2.22.5/VERSION 2012-03-21 14:52:22.000000000 +0100 @@ -1 +1 @@ -2.22.4 +2.22.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.22.4/src/Kiwi.ycp new/yast2-product-creator-2.22.5/src/Kiwi.ycp --- old/yast2-product-creator-2.22.4/src/Kiwi.ycp 2012-03-07 16:31:27.000000000 +0100 +++ new/yast2-product-creator-2.22.5/src/Kiwi.ycp 2012-03-21 09:04:17.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Data for kiwi configuration, input and output functions. * Authors: Jiri Suchomel <[email protected]> * - * $Id: Kiwi.ycp 67570 2012-03-07 08:37:11Z jsuchome $ + * $Id: Kiwi.ycp 67585 2012-03-07 15:32:12Z jsuchome $ */ { module "Kiwi"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.22.4/src/kiwi_dialogs.ycp new/yast2-product-creator-2.22.5/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.22.4/src/kiwi_dialogs.ycp 2012-03-07 16:18:33.000000000 +0100 +++ new/yast2-product-creator-2.22.5/src/kiwi_dialogs.ycp 2012-03-16 15:42:24.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Dialogs for kiwi configuration * Authors: Jiri Suchomel <[email protected]> * - * $Id: kiwi_dialogs.ycp 67570 2012-03-07 08:37:11Z jsuchome $ + * $Id: kiwi_dialogs.ycp 67585 2012-03-07 15:32:12Z jsuchome $ */ { textdomain "product-creator"; @@ -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: [email protected] For additional commands, e-mail: [email protected]
