summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2014-04-09 17:00:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-09 18:21:42 +0100
commit046a9ea30356daf4f3f8f4ddfc5b57fcfd85a27f (patch)
tree558ec3c6fa67e9e53208c02bb645d80a902f6721
parent1eb84a84be9edca97fe23a5506b8ceea2943a2f3 (diff)
downloadpoky-046a9ea30356daf4f3f8f4ddfc5b57fcfd85a27f.tar.gz
poky-046a9ea30356daf4f3f8f4ddfc5b57fcfd85a27f.tar.bz2
poky-046a9ea30356daf4f3f8f4ddfc5b57fcfd85a27f.zip
bitbake: toaster: Allow toaster to start without pytz
This patch allows toaster to start without pytz. Django can work with or without pytz, but in the time zone fix I mistakenly added a hard dependency on this module. This patch eliminates the hard dependency. (Bitbake rev: 40027a6e093c3b7480bfaccbd57e0e613d9a7b71) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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:
for dirpath, dirnames, filenames in os.walk(ZONEINFOPATH):
for fn in filenames:
filepath = os.path.join(dirpath, fn)
+ zonename = filepath.lstrip(ZONEINFOPATH).strip()
try:
import pytz
from pytz.exceptions import UnknownTimeZoneError
- zonename = filepath.lstrip(ZONEINFOPATH).strip()
- if pytz.timezone(zonename) is not None:
- zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename
- except UnknownTimeZoneError, ValueError:
- # we expect timezone failures here, just move over
pass
+ try:
+ if pytz.timezone(zonename) is not None:
+ zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename
+ except UnknownTimeZoneError, ValueError:
+ # we expect timezone failures here, just move over
+ pass
+ except ImportError:
+ zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename
TIME_ZONE = zonefilelist[hashlib.md5(open('/etc/localtime').read()).hexdigest()]