[bitbake-devel] [PATCH v2] toaster: Allow toaster to start without pytz
Paul Eggleton
paul.eggleton at linux.intel.com
Wed Apr 9 17:20:45 UTC 2014
From: Alexandru DAMIAN <alexandru.damian at intel.com>
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.
Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
---
v2: Fix authorship and indentation issues
lib/toaster/toastermain/settings.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/toaster/toastermain/settings.py b/lib/toaster/toastermain/settings.py
index 6e9d85d..645f327 100644
--- a/lib/toaster/toastermain/settings.py
+++ b/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()]
--
1.9.0
More information about the bitbake-devel
mailing list