/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.0-LOCALE.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-LOCALE.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Tue Apr 12 07:23:30 2016 UTC (8 years, 6 months ago) by unnilennium
Branch: MAIN
CVS Tags: e-smith-base-5_8_0-71_el7_sme, e-smith-base-5_8_0-67_el7_sme, e-smith-base-5_8_0-64_el7_sme, e-smith-base-5_8_0-70_el7_sme, e-smith-base-5_8_0-60_el7_sme, e-smith-base-5_8_0-96_el7_sme, e-smith-base-5_8_0-21_el7_sme, e-smith-base-5_8_0-85_el7_sme, e-smith-base-5_8_0-50_el7_sme, e-smith-base-5_8_0-22_el7_sme, e-smith-base-5_8_0-81_el7_sme, e-smith-base-5_8_0-88_el7_sme, e-smith-base-5_8_0-99_el7_sme, e-smith-base-5_8_0-94_el7_sme, e-smith-base-5_8_0-98_el7_sme, e-smith-base-5_8_0-97_el7_sme, e-smith-base-5_8_0-39_el7_sme, e-smith-base-5_8_0-55_el7_sme, e-smith-base-5_8_0-62_el7_sme, e-smith-base-5_8_0-63_el7_sme, e-smith-base-5_8_0-86_el7_sme, e-smith-base-5_8_0-47_el7_sme, e-smith-base-5_8_0-40_el7_sme, e-smith-base-5_8_0-33_el7_sme, e-smith-base-5_8_0-42_el7_sme, e-smith-base-5_8_0-69_el7_sme, e-smith-base-5_8_0-29_el7_sme, e-smith-base-5_8_0-54_el7_sme, e-smith-base-5_8_0-13_el7_sme, e-smith-base-5_8_0-78_el7_sme, e-smith-base-5_8_0-61_el7_sme, e-smith-base-5_8_0-38_el7_sme, e-smith-base-5_8_0-79_el7_sme, e-smith-base-5_8_0-32_el7_sme, e-smith-base-5_8_0-59_el7_sme, e-smith-base-5_8_0-43_el7_sme, e-smith-base-5_8_0-72_el7_sme, e-smith-base-5_8_0-19_el7_sme, e-smith-base-5_8_0-27_el7_sme, e-smith-base-5_8_0-68_el7_sme, e-smith-base-5_8_0-84_el7_sme, e-smith-base-5_8_0-45_el7_sme, e-smith-base-5_8_0-51_el7_sme, e-smith-base-5_8_0-28_el7_sme, e-smith-base-5_8_0-26_el7_sme, e-smith-base-5_8_0-95_el7_sme, e-smith-base-5_8_0-49_el7_sme, e-smith-base-5_8_0-82_el7_sme, e-smith-base-5_8_0-44_el7_sme, e-smith-base-5_8_0-41_el7_sme, e-smith-base-5_8_0-75_el7_sme, e-smith-base-5_8_0-90_el7_sme, e-smith-base-5_8_0-93_el7_sme, e-smith-base-5_8_0-46_el7_sme, e-smith-base-5_8_0-12_el7_sme, e-smith-base-5_8_0-36_el7_sme, e-smith-base-5_8_0-15_el7_sme, e-smith-base-5_8_0-76_el7_sme, e-smith-base-5_8_0-30_el7_sme, e-smith-base-5_8_0-58_el7_sme, e-smith-base-5_8_0-18_el7_sme, e-smith-base-5_8_0-87_el7_sme, e-smith-base-5_8_0-66_el7_sme, e-smith-base-5_8_0-17_el7_sme, e-smith-base-5_8_0-16_el7_sme, e-smith-base-5_8_0-65_el7_sme, e-smith-base-5_8_0-23_el7_sme, e-smith-base-5_8_0-83_el7_sme, e-smith-base-5_8_0-80_el7_sme, e-smith-base-5_8_0-92_el7_sme, e-smith-base-5_8_0-20_el7_sme, e-smith-base-5_8_0-34_el7_sme, e-smith-base-5_8_0-37_el7_sme, e-smith-base-5_8_0-52_el7_sme, e-smith-base-5_8_0-74_el7_sme, e-smith-base-5_8_0-77_el7_sme, e-smith-base-5_8_0-73_el7_sme, e-smith-base-5_8_0-35_el7_sme, e-smith-base-5_8_0-91_el7_sme, e-smith-base-5_8_0-31_el7_sme, e-smith-base-5_8_0-53_el7_sme, e-smith-base-5_8_0-24_el7_sme, e-smith-base-5_8_0-14_el7_sme, e-smith-base-5_8_0-48_el7_sme, e-smith-base-5_8_0-89_el7_sme
* Tue Apr 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-12.sme
- fix getting locale for db configuration  [SME: 9378]

1 unnilennium 1.1 diff -up e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig.LOCALE e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig
2     --- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig.LOCALE 2014-03-23 22:47:24.000000000 -0400
3     +++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig 2016-04-12 03:17:54.640000000 -0400
4     @@ -1,5 +1,5 @@
5     {
6     - open F, "/etc/sysconfig/i18n";
7     + open F, "/etc/locale.conf";
8     my ($line) = grep(/^LANG/, <F>);
9     close F;
10    
11     @@ -8,19 +8,19 @@
12     my $kbdtype = "pc";
13     my $keytable = "us";
14    
15     - if (open F, "/etc/sysconfig/keyboard")
16     + if (open F, "/etc/X11/xorg.conf.d/00-keyboard.conf")
17     {
18     my @lines = <F>;
19     close F;
20    
21     - ($line) = grep(/^KEYBOARDTYPE/, @lines);
22     - if ($line =~ /^KEYBOARDTYPE="(.*)"/)
23     - {
24     - $kbdtype = $1;
25     - }
26     + #($line) = grep(/^KEYBOARDTYPE/, @lines);
27     + #if ($line =~ /^KEYBOARDTYPE="(.*)"/)
28     + #{
29     + # $kbdtype = $1;
30     + #}
31    
32     - ($line) = grep(/^KEYTABLE/, @lines);
33     - if ($line =~ /^KEYTABLE="(.*)"/)
34     + ($line) = grep(/^\s+Option "XkbLayout"/, @lines);
35     + if ($line =~ /^\s+Option "XkbLayout"\s+"(.*)"/)
36     {
37     $keytable = $1;
38     }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed