From 046a9ea30356daf4f3f8f4ddfc5b57fcfd85a27f Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Wed, 9 Apr 2014 17:00:53 +0000 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastermain/settings.py | 14 +++++++++----- 1 file 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()] -- cgit v1.2.3-54-g00ecf