Re: [PATCH 1/1] toaster: fixup dependency excludes for customimage

[Michael Wood <michael.g.wood@intel.com>]

Thanks for the patch. Just a small fix needed here.

On 29/02/16 21:26, Dave Lerner wrote:
> [YOCTO #9156]
>
> For a customized image when adding a dependent package X that depends on
> dependency package Y, in addition to adding X to appends_set and Y to
> includes_set, make sure that Y is no longer in the excludes_set. Y may
> have been added to the excludes_set by a prior package removal.
>
> Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
> ---
>   bitbake/lib/toaster/toastergui/views.py | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
> index 28b03d3..4670139 100755
> --- a/bitbake/lib/toaster/toastergui/views.py
> +++ b/bitbake/lib/toaster/toastergui/views.py
> @@ -2653,6 +2653,13 @@ if True:
>                                              name=dep.depends_on.name)
>   
>                           recipe.includes_set.add(cust_package)
> +                        try:
> +                            # when adding the pre-requisite package make sure it's not in the
> +                            #   excluded list from a prior removal.
> +                            recipe.excludes_set.remove(cust_package)
> +                        except Package.DoesNotExist:
> +                            #   Don't care if the package had never been excluded
> +                            return {"error": "ok"}

We don't want to /return/ as we would end up exiting the loop on the 
first package that causes the DoesNotExist exception a /pass/ would be 
fine here.

>                       except:
>                           logger.warning("Could not add package's suggested"
>                                          "dependencies to the list")