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>
This commit is contained in:
parent
1eb84a84be
commit
046a9ea303
|
@ -64,15 +64,19 @@ else:
|
||||||
for dirpath, dirnames, filenames in os.walk(ZONEINFOPATH):
|
for dirpath, dirnames, filenames in os.walk(ZONEINFOPATH):
|
||||||
for fn in filenames:
|
for fn in filenames:
|
||||||
filepath = os.path.join(dirpath, fn)
|
filepath = os.path.join(dirpath, fn)
|
||||||
|
zonename = filepath.lstrip(ZONEINFOPATH).strip()
|
||||||
try:
|
try:
|
||||||
import pytz
|
import pytz
|
||||||
from pytz.exceptions import UnknownTimeZoneError
|
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
|
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()]
|
TIME_ZONE = zonefilelist[hashlib.md5(open('/etc/localtime').read()).hexdigest()]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue