Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47452 - in /trunk/country: VERSION keyboard/src/modules/Keyboard.ycp language/src/modules/Language.ycp package/yast2-country.changes timezone/src/Timezone.ycp
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Mon, 12 May 2008 11:56:57 -0000
  • Message-id: <20080512115657.58FB72BBD5@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Mon May 12 13:56:56 2008
New Revision: 47452

URL: http://svn.opensuse.org/viewcvs/yast?rev=47452&view=rev
Log:
- force reading timezone/keyboard DB when it is empty (bnc#386298)
- 2.16.23


Modified:
trunk/country/VERSION
trunk/country/keyboard/src/modules/Keyboard.ycp
trunk/country/language/src/modules/Language.ycp
trunk/country/package/yast2-country.changes
trunk/country/timezone/src/Timezone.ycp

Modified: trunk/country/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=47452&r1=47451&r2=47452&view=diff
==============================================================================
--- trunk/country/VERSION (original)
+++ trunk/country/VERSION Mon May 12 13:56:56 2008
@@ -1 +1 @@
-2.16.22
+2.16.23

Modified: trunk/country/keyboard/src/modules/Keyboard.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/modules/Keyboard.ycp?rev=47452&r1=47451&r2=47452&view=diff
==============================================================================
--- trunk/country/keyboard/src/modules/Keyboard.ycp (original)
+++ trunk/country/keyboard/src/modules/Keyboard.ycp Mon May 12 13:56:56 2008
@@ -448,7 +448,7 @@
map base_lang2keyboard = (map)SCR::Read(.target.yast2,
"lang2keyboard.ycp");
if (base_lang2keyboard == nil) base_lang2keyboard = $[];

- return union (base_lang2keyboard, Language::GetLang2KeyboardMap ());
+ return union (base_lang2keyboard, Language::GetLang2KeyboardMap (true));
}



Modified: trunk/country/language/src/modules/Language.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Language.ycp?rev=47452&r1=47451&r2=47452&view=diff
==============================================================================
--- trunk/country/language/src/modules/Language.ycp (original)
+++ trunk/country/language/src/modules/Language.ycp Mon May 12 13:56:56 2008
@@ -258,7 +258,9 @@
* return the content of lang2timezone map
* (mapping of languages to their default (proposed) time zones)
*/
-global define map<string,string> GetLang2TimezoneMap () {
+global define map<string,string> GetLang2TimezoneMap (boolean force) {
+ if (size (languages_map) == 0 && force)
+ read_languages_map();
return lang2timezone;
}

@@ -266,7 +268,9 @@
* return the content of lang2keyboard map
* (mapping of languages to their default (proposed) keyboard layouts)
*/
-global define map<string,string> GetLang2KeyboardMap () {
+global define map<string,string> GetLang2KeyboardMap (boolean force) {
+ if (size (languages_map) == 0 && force)
+ read_languages_map();
return lang2keyboard;
}


Modified: trunk/country/package/yast2-country.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=47452&r1=47451&r2=47452&view=diff
==============================================================================
--- trunk/country/package/yast2-country.changes (original)
+++ trunk/country/package/yast2-country.changes Mon May 12 13:56:56 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon May 12 13:27:42 CEST 2008 - jsuchome@xxxxxxx
+
+- force reading timezone/keyboard DB when it is empty (bnc#386298)
+- 2.16.23
+
+-------------------------------------------------------------------
Wed May 7 12:21:03 CEST 2008 - jsuchome@xxxxxxx

- during live-install, do not behave like in 1st stage (bnc#381415)

Modified: trunk/country/timezone/src/Timezone.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.ycp?rev=47452&r1=47451&r2=47452&view=diff
==============================================================================
--- trunk/country/timezone/src/Timezone.ycp (original)
+++ trunk/country/timezone/src/Timezone.ycp Mon May 12 13:56:56 2008
@@ -173,7 +173,7 @@

lang2tz = (map<string,string>) union (
base_lang2tz,
- Language::GetLang2TimezoneMap ()
+ Language::GetLang2TimezoneMap (true)
);
}
return lang2tz;

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

< Previous Next >
This Thread
  • No further messages