[yast-commit] r52311 - in /trunk/country: VERSION keyboard/src/modules/Keyboard.ycp package/yast2-country.changes timezone/src/Timezone.ycp timezone/src/dialogs.ycp

Author: mvidner Date: Thu Oct 16 19:49:16 2008 New Revision: 52311 URL: http://svn.opensuse.org/viewcvs/yast?rev=52311&view=rev Log: Fixed localized sorting to emulate < instead of <=, avoiding a crash (bnc#385172). Modified: trunk/country/VERSION trunk/country/keyboard/src/modules/Keyboard.ycp trunk/country/package/yast2-country.changes trunk/country/timezone/src/Timezone.ycp trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=52311&r1=52310&r2=52311&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Oct 16 19:49:16 2008 @@ -1 +1 @@ -2.17.21 +2.17.22 Modified: trunk/country/keyboard/src/modules/Keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/modules/Keyboard.ycp?rev=52311&r1=52310&r2=52311&view=diff ============================================================================== --- trunk/country/keyboard/src/modules/Keyboard.ycp (original) +++ trunk/country/keyboard/src/modules/Keyboard.ycp Thu Oct 16 19:49:16 2008 @@ -1294,8 +1294,11 @@ `item (`id(code), name, current_kbd == code) )); return sort (term a, term b, ret, { + // bnc#385172: must use < instead of <=, the following means: + // strcoll(x) <= strcoll(y) && strcoll(x) != strcoll(y) list lsorted = lsort ([a[1]:"", b[1]:""]); - return (lsorted[0]:"" == a[1]:"" && a[1]:"" != b[1]:""); + list lsorted_r = lsort ([b[1]:"", a[1]:""]); + return (lsorted[0]:"" == a[1]:"" && lsorted == lsorted_r); }); } Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=52311&r1=52310&r2=52311&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Oct 16 19:49:16 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 16 19:49:04 CEST 2008 - mvidner@suse.cz + +- Fixed localized sorting to emulate < instead of <=, + avoiding a crash (bnc#385172). +- 2.17.22 + +------------------------------------------------------------------- Thu Oct 9 12:53:37 CEST 2008 - jsuchome@suse.cz - fixed help text typo (bnc#433731) Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.ycp?rev=52311&r1=52310&r2=52311&view=diff ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Thu Oct 16 19:49:16 2008 @@ -202,8 +202,11 @@ zonemap = sort (map a, map b, zmap, { // [ "USA", "Canada" ] -> [ "Canada", "USA" ] + // bnc#385172: must use < instead of <=, the following means: + // strcoll(x) <= strcoll(y) && strcoll(x) != strcoll(y) list lsorted = lsort ([a["name"]:"", b["name"]:""]); - return (lsorted[0]:"" == a["name"]:"" && a["name"]:"" != b["name"]:""); + list lsorted_r = lsort ([b["name"]:"", a["name"]:""]); + return lsorted[0]:"" == a["name"]:"" && lsorted == lsorted_r; }); } return zonemap; @@ -674,8 +677,11 @@ string key, string name, zmap[num,"entries"]:$[], ``([ name, key ])); trl = sort (list<string> a, list<string> b, trl, { + // bnc#385172: must use < instead of <=, the following means: + // strcoll(x) <= strcoll(y) && strcoll(x) != strcoll(y) list lsorted = lsort ([a[0]:"", b[0]:""]); - return (lsorted[0]:"" == a[0]:"" && a[0]:"" != b[0]:""); + list lsorted_r = lsort ([b[0]:"", a[0]:""]); + return (lsorted[0]:"" == a[0]:"" && lsorted == lsorted_r); }); y2debug ("trl = %1", trl); Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp?rev=52311&r1=52310&r2=52311&view=diff ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Thu Oct 16 19:49:16 2008 @@ -624,14 +624,13 @@ maplist (string key, string name, zonemap[region,"entries"]:$[], ``([ name, key ])); - // prevent the crash in installation (workaround for bnc#385172) - if (Language::language != "ko_KR" && Language::language != "ja_JP") - { - reg_list = sort (list a, list b, (list<list>) reg_list, { + reg_list = sort (list a, list b, (list<list>) reg_list, { + // bnc#385172: must use < instead of <=, the following means: + // strcoll(x) <= strcoll(y) && strcoll(x) != strcoll(y) list lsorted = lsort ([a[0]:"", b[0]:""]); - return (lsorted[0]:"" == a[0]:"" && a[0]:"" != b[0]:""); - }); - } + list lsorted_r = lsort ([b[0]:"", a[0]:""]); + return lsorted[0]:"" == a[0]:"" && lsorted == lsorted_r; + }); sorted_zonemap[region] = reg_list; } return maplist (list entry, sorted_zonemap[region]:[], -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org