summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/views.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 78726a88bc..f5fa72e610 100644
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -496,7 +496,8 @@ def task( request, build_id, task_id ):
496 context[ 'showing_matches' ] = True 496 context[ 'showing_matches' ] = True
497 context[ 'matching_tasks' ] = Task.objects.filter( 497 context[ 'matching_tasks' ] = Task.objects.filter(
498 sstate_checksum=task.sstate_checksum ).filter( 498 sstate_checksum=task.sstate_checksum ).filter(
499 build__completed_on__lt=task.build.completed_on ).order_by('-build__completed_on') 499 build__completed_on__lt=task.build.completed_on).exclude(
500 order__isnull=True).exclude(outcome=Task.OUTCOME_NA).order_by('-build__completed_on')
500 501
501 return render( request, template, context ) 502 return render( request, template, context )
502 503
@@ -509,7 +510,7 @@ def recipe(request, build_id, recipe_id):
509 object = Recipe.objects.filter(pk=recipe_id)[0] 510 object = Recipe.objects.filter(pk=recipe_id)[0]
510 layer_version = Layer_Version.objects.filter(pk=object.layer_version_id)[0] 511 layer_version = Layer_Version.objects.filter(pk=object.layer_version_id)[0]
511 layer = Layer.objects.filter(pk=layer_version.layer_id)[0] 512 layer = Layer.objects.filter(pk=layer_version.layer_id)[0]
512 tasks = Task.objects.filter(recipe_id = recipe_id).filter(build_id = build_id).exclude(task_name__endswith='_setscene') 513 tasks = Task.objects.filter(recipe_id = recipe_id, build_id = build_id).exclude(order__isnull=True).exclude(task_name__endswith='_setscene').exclude(outcome=Task.OUTCOME_NA)
513 packages = Package.objects.filter(recipe_id = recipe_id).filter(build_id = build_id).filter(size__gte=0) 514 packages = Package.objects.filter(recipe_id = recipe_id).filter(build_id = build_id).filter(size__gte=0)
514 515
515 context = { 516 context = {
@@ -762,14 +763,16 @@ def dirinfo(request, build_id, target_id, file_path=None):
762def _find_task_dep(task): 763def _find_task_dep(task):
763 tp = [] 764 tp = []
764 for p in Task_Dependency.objects.filter(task=task): 765 for p in Task_Dependency.objects.filter(task=task):
765 tp.append(p.depends_on); 766 if (p.depends_on.order > 0) and (p.depends_on.outcome != Task.OUTCOME_NA):
767 tp.append(p.depends_on);
766 return tp 768 return tp
767 769
768 770
769def _find_task_revdep(task): 771def _find_task_revdep(task):
770 tp = [] 772 tp = []
771 for p in Task_Dependency.objects.filter(depends_on=task): 773 for p in Task_Dependency.objects.filter(depends_on=task):
772 tp.append(p.task); 774 if (p.task.order > 0) and (p.task.outcome != Task.OUTCOME_NA):
775 tp.append(p.task);
773 return tp 776 return tp
774 777
775def _find_task_provider(task): 778def _find_task_provider(task):
@@ -836,7 +839,7 @@ def tasks_common(request, build_id, variant, task_anchor):
836 mandatory_parameters['anchor']=task_anchor 839 mandatory_parameters['anchor']=task_anchor
837 return _redirect_parameters( variant, request.GET, mandatory_parameters, build_id = build_id) 840 return _redirect_parameters( variant, request.GET, mandatory_parameters, build_id = build_id)
838 (filter_string, search_term, ordering_string) = _search_tuple(request, Task) 841 (filter_string, search_term, ordering_string) = _search_tuple(request, Task)
839 queryset_all = Task.objects.filter(build=build_id, order__gt=0) 842 queryset_all = Task.objects.filter(build=build_id).exclude(order__isnull=True).exclude(outcome=Task.OUTCOME_NA)
840 queryset_with_search = _get_queryset(Task, queryset_all, None , search_term, ordering_string, 'order') 843 queryset_with_search = _get_queryset(Task, queryset_all, None , search_term, ordering_string, 'order')
841 queryset = _get_queryset(Task, queryset_all, filter_string, search_term, ordering_string, 'order') 844 queryset = _get_queryset(Task, queryset_all, filter_string, search_term, ordering_string, 'order')
842 845