Re: [PATCH] package.bbclass: fix globbing for mask-like files

[Koen Kooi <k.kooi@student.utwente.nl>]

On 01-04-09 12:15, Roman I Khimov wrote:
> When a package contains two files like "name*" and "name*smth" OE can't
> properly package those, looping infinetely trying to build file list. The
> reason is that first file name globs to two files and OE adds them both
> into the list, then globs the first one again and gets two same files, etc.

Acked-by: Koen Kooi <koen@openembedded.org>


>
> Fix that.
> ---
>   classes/package.bbclass |    8 ++++++--
>   1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/classes/package.bbclass b/classes/package.bbclass
> index 7a61c5a..8a77369 100644
> --- a/classes/package.bbclass
> +++ b/classes/package.bbclass
> @@ -384,8 +384,12 @@ python populate_packages () {
>   			globbed = glob.glob(file)
>   			if globbed:
>   				if [ file ] != globbed:
> -					files += globbed
> -					continue
> +					if not file in globbed:
> +						files += globbed
> +						continue
> +					else:
> +						globbed.remove(file)
> +						files += globbed
>   			if (not os.path.islink(file)) and (not os.path.exists(file)):
>   				continue
>   			if file in seen: