[bitbake-devel] [PATCH] fetch2: Cleanup file checksum generation

[Paul Eggleton]

On Saturday 26 April 2014 16:32:18 Jacob Kroon wrote:
> Cleanup the fix done in f9416e76e272ba3249abff099f6f3a47fe82e03e.
> 
> Instead of adding continue statements we can just move the last
> statements into the final else-clause.
> 
> Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
> ---
>  lib/bb/fetch2/__init__.py | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
> index 5a03a0e..bc4e8fd 100644
> --- a/lib/bb/fetch2/__init__.py
> +++ b/lib/bb/fetch2/__init__.py
> @@ -985,15 +985,12 @@ def get_file_checksums(filelist, pn):
>                      checksum = checksum_file(f)
>                      if checksum:
>                          checksums.append((f, checksum))

Note the above, then see below.

> -            continue
>          elif os.path.isdir(pth):
>              checksums.extend(checksum_dir(pth))
> -            continue
>          else:
>              checksum = checksum_file(pth)
> -
> -        if checksum:
> -            checksums.append((pth, checksum))
> +            if checksum:
> +                checksums.append((pth, checksum))
> 
>      checksums.sort(key=operator.itemgetter(1))
>      return checksums

This cleanup seems innocuous but unfortunately it does cause a change in 
behaviour - now for the glob case we will get the last item duplicated because 
it will be added to the list a second time at the end.

Richard can you please revert this?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre