]>
Commit | Line | Data |
---|---|---|
c2f22095 AM |
1 | diff -ur anaconda-11.2.0.24.org/iw/timezone_gui.py anaconda-11.2.0.24/iw/timezone_gui.py |
2 | --- anaconda-11.2.0.24.org/iw/timezone_gui.py 2007-01-30 19:54:05.000000000 +0100 | |
3 | +++ anaconda-11.2.0.24/iw/timezone_gui.py 2007-02-20 18:36:25.274623000 +0100 | |
4 | @@ -43,7 +43,7 @@ | |
dd9587f1 ER |
5 | gtk.glade.set_custom_handler(self.custom_widget_handler) |
6 | ||
7 | # Set the default now. We'll fix it for real in getScreen. | |
c5c70e8e | 8 | - self.default = "America/New York" |
c2f22095 | 9 | + self.default = "Europe/Warsaw" |
dd9587f1 ER |
10 | |
11 | self.zonetab = zonetab.ZoneTab() | |
12 | ||
c2f22095 | 13 | @@ -99,7 +99,7 @@ |
dd9587f1 ER |
14 | asUTC = 0 |
15 | ||
16 | if (string.find(self.default, "UTC") != -1): | |
17 | - self.default = "America/New_York" | |
c2f22095 | 18 | + self.default = "Europe/Warsaw" |
dd9587f1 | 19 | |
c5c70e8e PZ |
20 | self.default = self.default.replace("_", " ") |
21 | ||
c2f22095 AM |
22 | @@ -151,7 +151,7 @@ |
23 | weight=pango.WEIGHT_BOLD) | |
24 | self.markers[entry.tz] = marker | |
dd9587f1 | 25 | |
c5c70e8e | 26 | - if entry.tz == "America/New York": |
c2f22095 AM |
27 | + if entry.tz == "Europe/Warsaw": |
28 | # In case the /etc/sysconfig/clock is messed up, use New | |
29 | # York as the default. | |
30 | self.fallbackEntry = entry | |
31 | diff -ur anaconda-11.2.0.24.org/timezone.py anaconda-11.2.0.24/timezone.py | |
32 | --- anaconda-11.2.0.24.org/timezone.py 2007-01-17 23:49:50.000000000 +0100 | |
33 | +++ anaconda-11.2.0.24/timezone.py 2007-02-20 19:07:07.498623000 +0100 | |
34 | @@ -13,6 +13,7 @@ | |
628ff5bd | 35 | |
c2f22095 AM |
36 | import shutil |
37 | import iutil | |
628ff5bd | 38 | +import string |
c2f22095 AM |
39 | from flags import flags |
40 | ||
41 | import logging | |
42 | @@ -44,12 +45,32 @@ | |
f1c25a37 ER |
43 | |
44 | f = open(instPath + "/etc/sysconfig/clock", "w") | |
c2f22095 | 45 | |
f1c25a37 | 46 | - f.write('ZONE="%s"\n' % self.tz) |
628ff5bd | 47 | + f.write('# Should the hardware clock be kept in Coordinated Universal Time (instead of local time).\n') |
f1c25a37 | 48 | f.write("UTC=%s\n" % bool(self.utc)) |
628ff5bd | 49 | + f.write('# true means your machine uses epoch 1980 in its hardware clock\n') |
f1c25a37 | 50 | f.write("ARC=%s\n" % bool(self.arc)) |
c2f22095 | 51 | - |
628ff5bd | 52 | + f.write('# true means your machine uses epoch 1900 in its hardware clock\n') |
f1c25a37 | 53 | + f.write("SRM=false\n") |
c2f22095 AM |
54 | f.close() |
55 | ||
f1c25a37 ER |
56 | + # FIXME: solution for timezones like EET |
57 | + (area, zone) = string.split(self.tz, "/") | |
c2f22095 | 58 | + |
f1c25a37 | 59 | + f = open(instPath + "/etc/sysconfig/timezone", "w") |
628ff5bd ER |
60 | + f.write('# Time zone information.\n') |
61 | + f.write('# Directory containing zone information files.\n') | |
62 | + f.write('ZONE_INFO_DIR="/usr/share/zoneinfo"\n') | |
f1c25a37 | 63 | + f.write("\n"); |
628ff5bd ER |
64 | + f.write('# Scheme you would like to use in your system.\n') |
65 | + f.write('ZONE_INFO_SCHEME="posix"\n') | |
f1c25a37 | 66 | + f.write("\n") |
628ff5bd | 67 | + f.write('# Area (sometimes may be empty)\n') |
f1c25a37 ER |
68 | + f.write('ZONE_INFO_AREA="%s"\n' % area) |
69 | + f.write("\n") | |
628ff5bd | 70 | + f.write('# Name of the time zone for your system.\n') |
f1c25a37 ER |
71 | + f.write('TIME_ZONE="%s"\n' % zone) |
72 | + f.write("\n"); | |
c2f22095 | 73 | + |
f1c25a37 | 74 | def getTimezoneInfo(self): |
c2f22095 AM |
75 | return (self.tz, self.utc, self.arc) |
76 |