git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8da970
)
timezone handling: when there is no timezone, use UTC. ignore illegal config values
author
Felix Domke
<tmbinc@elitedvb.net>
Thu, 17 Nov 2005 20:53:32 +0000
(20:53 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Thu, 17 Nov 2005 20:53:32 +0000
(20:53 +0000)
lib/python/Components/Timezones.py
patch
|
blob
|
history
diff --git
a/lib/python/Components/Timezones.py
b/lib/python/Components/Timezones.py
index 0b6eb79bfe880b896905edf132757ae300ad3f74..15837450e1074a70966a57a627740c74b0ed807e 100644
(file)
--- a/
lib/python/Components/Timezones.py
+++ b/
lib/python/Components/Timezones.py
@@
-23,11
+23,21
@@
class Timezones:
def readTimezonesFromFile(self):
parser = make_parser()
def readTimezonesFromFile(self):
parser = make_parser()
- timezonesHandler = self.parseTimezones(self.timezones)
- parser.setContentHandler(timezonesHandler)
- parser.parse('/etc/timezone.xml')
+
+ try:
+ timezonesHandler = self.parseTimezones(self.timezones)
+ parser.setContentHandler(timezonesHandler)
+ parser.parse('/etc/timezone.xml')
+ except:
+ pass
+
+ if len(self.timezones) == 0:
+ self.timezones = [("UTC", "UTC")]
def activateTimezone(self, index):
def activateTimezone(self, index):
+ if len(self.timezones) <= index:
+ return
+
os.environ['TZ'] = self.timezones[index][1]
try:
time.tzset()
os.environ['TZ'] = self.timezones[index][1]
try:
time.tzset()