summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastermain/settings.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index 6e9d85d4c0..645f32746d 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -64,15 +64,19 @@ else:
64 for dirpath, dirnames, filenames in os.walk(ZONEINFOPATH): 64 for dirpath, dirnames, filenames in os.walk(ZONEINFOPATH):
65 for fn in filenames: 65 for fn in filenames:
66 filepath = os.path.join(dirpath, fn) 66 filepath = os.path.join(dirpath, fn)
67 zonename = filepath.lstrip(ZONEINFOPATH).strip()
67 try: 68 try:
68 import pytz 69 import pytz
69 from pytz.exceptions import UnknownTimeZoneError 70 from pytz.exceptions import UnknownTimeZoneError
70 zonename = filepath.lstrip(ZONEINFOPATH).strip()
71 if pytz.timezone(zonename) is not None:
72 zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename
73 except UnknownTimeZoneError, ValueError:
74 # we expect timezone failures here, just move over
75 pass 71 pass
72 try:
73 if pytz.timezone(zonename) is not None:
74 zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename
75 except UnknownTimeZoneError, ValueError:
76 # we expect timezone failures here, just move over
77 pass
78 except ImportError:
79 zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename
76 80
77 TIME_ZONE = zonefilelist[hashlib.md5(open('/etc/localtime').read()).hexdigest()] 81 TIME_ZONE = zonefilelist[hashlib.md5(open('/etc/localtime').read()).hexdigest()]
78 82