projects / packages / system-config-date.git / blame
| Commit | Line | Data |
|---|---|---|
| 587e0018 ER |
1 | --- system-config-date-1.9.67/./src/scdate/core/timezoneBackend.py~ 2011-10-18 13:49:29.000000000 +0300 |
| 2 | +++ system-config-date-1.9.67/./src/scdate/core/timezoneBackend.py 2012-03-03 13:52:47.103894646 +0200 | |
| 3 | @@ -49,12 +49,12 @@ | |
| 4 | #If it does, copy the new time zone file into the chroot jail | |
| 5 | linkorcopyfile (fromFile, "/var/spool/postfix/etc/localtime") | |
| 6 | ||
| 7 | - #Write info to the /etc/sysconfig/clock file | |
| 8 | + #Write info to the /etc/sysconfig/timezone file | |
| 9 | f = open("/etc/sysconfig/clock", "w") | |
| 10 | f.write ("# The time zone of the system is defined by the contents of /etc/localtime.\n") | |
| 11 | f.write ("# This file is only for evaluation by system-config-date, do not rely on its\n") | |
| 12 | f.write ("# contents elsewhere.\n") | |
| 13 | - f.write('ZONE="%s"\n' % timezone) | |
| 14 | + f.write('TIMEZONE="%s"\n' % timezone) | |
| 15 | f.close() | |
| 16 | ||
| 17 | if self._adjtimeHasUTCInfo: | |
| 18 | @@ -81,7 +81,7 @@ | |
| 19 | def __init__(self): | |
| 20 | self.tz = "America/New_York" | |
| 21 | self.utc = "false" | |
| 22 | - path = '/etc/sysconfig/clock' | |
| 23 | + path = '/etc/sysconfig/timezone' | |
| 24 | lines = [] | |
| 25 | self._canHwClock = None | |
| 26 | self._adjtimeHasUTCInfo = None | |
| 27 | @@ -91,7 +91,7 @@ | |
| 28 | lines = fd.readlines() | |
| 29 | fd.close() | |
| 30 | else: | |
| 31 | - #There's no /etc/sysconfig/clock file, so make one | |
| 32 | + #There's no /etc/sysconfig/timezone file, so make one | |
| 33 | fd = open(path, 'w') | |
| 34 | fd.close | |
| 35 | pass | |
| 36 | @@ -103,7 +103,7 @@ | |
| 37 | continue | |
| 38 | try: | |
| 39 | tokens = line.split ("=") | |
| 40 | - if tokens[0] == "ZONE": | |
| 41 | + if tokens[0] == "TIMEZONE": | |
| 42 | self.tz = tokens[1].replace ('"', '') | |
| 43 | self.tz = self.tz.replace ('_', ' ') | |
| 44 | except: | |
| 45 | --- system-config-date-1.9.67/./src/timezone_map_gui.py~ 2011-10-18 13:49:29.000000000 +0300 | |
| 46 | +++ system-config-date-1.9.67/./src/timezone_map_gui.py 2012-03-03 13:53:15.975214698 +0200 | |
| 47 | @@ -214,7 +214,7 @@ | |
| 48 | if entry.tz == default: | |
| 49 | self.currentEntry = entry | |
| 50 | if entry.tz == "America/New York": | |
| 51 | - #In case the /etc/sysconfig/clock is messed up, use New York as default | |
| 52 | + #In case the /etc/sysconfig/timezone is messed up, use New York as default | |
| 53 | self.fallbackEntry = entry | |
| 54 | ||
| 55 | self.treeStore.set_sort_column_id (self.columns.TZSORT, gtk.SORT_ASCENDING) | |
| 56 | @@ -604,7 +604,7 @@ | |
| 57 | self.markers[self.currentEntry.tz].show () | |
| 58 | ||
| 59 | if not entry: | |
| 60 | - # If the value in /etc/sysconfig/clock is invalid, default to New York | |
| 61 | + # If the value in /etc/sysconfig/timezone is invalid, default to New York | |
| 62 | self.currentEntry = self.fallbackEntry | |
| 63 | else: | |
| 64 | self.currentEntry = entry |