[oe-commits] [bitbake] 04/17: toaster: fixup dependency excludes for customimage

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository bitbake.

commit 6b29d3297de2ae48a3ac5529ba0d22f895276b56
Author: Dave Lerner <dave.lerner at windriver.com>
AuthorDate: Fri Mar 4 16:41:27 2016 +0000

    toaster: fixup dependency excludes for customimage
    
    [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 at windriver.com>
    Signed-off-by: Michael Wood <michael.g.wood at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/toaster/toastergui/views.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 28b03d3..f3b8d3c 100755
--- a/lib/toaster/toastergui/views.py
+++ b/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
+                            pass
                     except:
                         logger.warning("Could not add package's suggested"
                                        "dependencies to the list")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.