From: Michael Wood Date: Mon, 7 Mar 2016 12:01:48 +0000 (+0000) Subject: toaster: views api Package info return both kinds of RDEPENDS X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3b5f3b7ba4550e7cd03a37ca19ccd2fc0042b2d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git toaster: views api Package info return both kinds of RDEPENDS As we do with the popover snippet which shows dependencies inline in the table also show dependencies which have both TYPE_TRDEPENDS and TYPE_RDEPENDS. Also remove obsolete comment Signed-off-by: Michael Wood Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index f3b8d3cd59e..bd118920aba 100755 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -2577,9 +2577,6 @@ if True: else: all_current_packages = recipe.get_all_packages() - # TODO currently we ignore packgegroups as we don't have a - # way to deal with them yet. - # Dependencies for package which aren't satisfied by the # current packages in the custom image recipe deps = package.package_dependencies_source.annotate( @@ -2587,8 +2584,10 @@ if True: pk=F('depends_on__pk'), size=F('depends_on__size'), ).values("name", "pk", "size").filter( - ~Q(pk__in=all_current_packages) & - Q(dep_type=Package_Dependency.TYPE_TRDEPENDS) + # There are two depends types we don't know why + (Q(dep_type=Package_Dependency.TYPE_TRDEPENDS) | + Q(dep_type=Package_Dependency.TYPE_RDEPENDS)) & + ~Q(pk__in=all_current_packages) ) # Reverse dependencies which are needed by packages that are