Re: [PATCH] Skip over event handler calls with incomplete environment

[Alexander Smirnov <asmirnov@ilbers.de>]

On 02/07/2018 06:59 PM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> The cleanup handler is called a couple of times per shutdown and,
> depending on the setup, some may not have a complete config. Avoid that
> we stumble and fall over any of the environment variables being
> undefined.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Should I apply me previous one?

Alex

> ---
>   meta/classes/isar-events.bbclass | 17 +++++++++--------
>   1 file changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass
> index ae0f791..4b5e97e 100644
> --- a/meta/classes/isar-events.bbclass
> +++ b/meta/classes/isar-events.bbclass
> @@ -15,15 +15,16 @@ python isar_handler () {
>           distro = d.getVar('DISTRO', True)
>           arch = d.getVar('DISTRO_ARCH', True)
>   
> -        w = tmpdir + '/work/' + distro + '-' + arch
> +        if tmpdir and distro and arch:
> +            w = tmpdir + '/work/' + distro + '-' + arch
>   
> -        # '/proc/mounts' contains all the active mounts, so knowing 'w' we
> -        # could get the list of mounts for the specific multiconfig and
> -        # clean them.
> -        with open('/proc/mounts', 'rU') as f:
> -            for line in f:
> -                if w in line:
> -                    subprocess.call('sudo umount -f ' + line.split()[1], stdout=devnull, stderr=devnull, shell=True)
> +            # '/proc/mounts' contains all the active mounts, so knowing 'w' we
> +            # could get the list of mounts for the specific multiconfig and
> +            # clean them.
> +            with open('/proc/mounts', 'rU') as f:
> +                for line in f:
> +                    if w in line:
> +                        subprocess.call('sudo umount -f ' + line.split()[1], stdout=devnull, stderr=devnull, shell=True)
>   
>       devnull.close()
>   }
>