[bitbake-devel] [PATCH 03/14] toaster: do not load all available timezones

[Paul Eggleton]

On Friday 04 April 2014 15:10:42 Alex DAMIAN wrote:
> From: Alexandru DAMIAN <alexandru.damian at intel.com>
> 
> This patch makes sure that we only load pytz-recognized
> timezones. Pytz is used to transform the timezone information
> for the database queries, and needs to be able to deal with
> the TIME_ZONE value that we set up.
> 
> [YOCTO #6093]
> 
> Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
> ---
>  lib/toaster/toastermain/settings.py | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/toaster/toastermain/settings.py
> b/lib/toaster/toastermain/settings.py index e26ee3c..e39b4cb 100644
> --- a/lib/toaster/toastermain/settings.py
> +++ b/lib/toaster/toastermain/settings.py
> @@ -64,7 +64,13 @@ else:
>      for dirpath, dirnames, filenames in os.walk(ZONEINFOPATH):
>          for fn in filenames:
>              filepath = os.path.join(dirpath, fn)
> -            zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] =
> filepath.lstrip(ZONEINFOPATH).strip() +            try:
> +                import pytz
> +                zonename = filepath.lstrip(ZONEINFOPATH).strip()
> +                if pytz.timezone(zonename) is not None:
> +                   
> zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename 
> +          except Exception:
> +                pass

Please do not do blanket exception catching like this. You need to catch the 
exact class of exception you expect to receive.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre