diff options
author | Dave Lerner <dave.lerner@windriver.com> | 2016-03-04 16:41:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-07 17:19:54 +0000 |
commit | 6b29d3297de2ae48a3ac5529ba0d22f895276b56 (patch) | |
tree | e0985336c66f3c4cca2546fa0b2276682f11d608 /lib | |
parent | b38975103e52a0c25e9ad9032c8cca1c47cbdcc2 (diff) | |
download | bitbake-6b29d3297de2ae48a3ac5529ba0d22f895276b56.tar.gz |
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@windriver.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/toaster/toastergui/views.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index 28b03d30b..f3b8d3cd5 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") |