diff options
author | David Reyna <David.Reyna@windriver.com> | 2014-04-08 03:26:12 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-09 17:00:02 +0100 |
commit | efa4a98fe4cea73fb8709d205230046e2a546bbf (patch) | |
tree | 02775051096ce909cb277ffd71fecd9b8606618b /bitbake/lib | |
parent | d3e5632efb1f10143c748c169f6439f39eb3cf21 (diff) | |
download | poky-efa4a98fe4cea73fb8709d205230046e2a546bbf.tar.gz |
bitbake: toaster: add URI search path list
Display the URI paths from SSTATE_DIR and SSTATE_MIRRORS
in the Task page.
[YOCTO #5996]
(Bitbake rev: 6d07b531736c2b304da2dfe661239fd3612b0541)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/task.html | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/views.py | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html index 66a6695ec1..455599932c 100644 --- a/bitbake/lib/toaster/toastergui/templates/task.html +++ b/bitbake/lib/toaster/toastergui/templates/task.html | |||
@@ -172,7 +172,7 @@ | |||
172 | <i class="icon-question-sign get-help" title="The locations searched for the above file (i.e. your <code>sstate-cache</code> directory and any mirrors you have set up)"></i> | 172 | <i class="icon-question-sign get-help" title="The locations searched for the above file (i.e. your <code>sstate-cache</code> directory and any mirrors you have set up)"></i> |
173 | URI(s) searched | 173 | URI(s) searched |
174 | </dt> | 174 | </dt> |
175 | <dd><code>{{task.work_directory}}</code></dd> | 175 | <dd><ul>{% for uri in uri_list %}<li><code>{{uri}}</code></li>{% endfor %}</ul></dd> |
176 | </dl> | 176 | </dl> |
177 | {% endif %} | 177 | {% endif %} |
178 | {% if task.sstate_result == task.SSTATE_MISS %} | 178 | {% if task.sstate_result == task.SSTATE_MISS %} |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 36eb0bf97e..e4ada14125 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -481,6 +481,17 @@ def task( request, build_id, task_id ): | |||
481 | if task.outcome == task.OUTCOME_FAILED: | 481 | if task.outcome == task.OUTCOME_FAILED: |
482 | pass | 482 | pass |
483 | 483 | ||
484 | uri_list= [ ] | ||
485 | variables = Variable.objects.filter(build=build_id) | ||
486 | v=variables.filter(variable_name='SSTATE_DIR') | ||
487 | if v.count > 0: | ||
488 | uri_list.append(v[0].variable_value) | ||
489 | v=variables.filter(variable_name='SSTATE_MIRRORS') | ||
490 | if (v.count > 0): | ||
491 | for mirror in v[0].variable_value.split('\\n'): | ||
492 | s=re.sub('.* ','',mirror.strip(' \t\n\r')) | ||
493 | if len(s): uri_list.append(s) | ||
494 | |||
484 | context = { | 495 | context = { |
485 | 'build' : Build.objects.filter( pk = build_id )[ 0 ], | 496 | 'build' : Build.objects.filter( pk = build_id )[ 0 ], |
486 | 'object' : task, | 497 | 'object' : task, |
@@ -491,6 +502,7 @@ def task( request, build_id, task_id ): | |||
491 | 'log_head' : log_head, | 502 | 'log_head' : log_head, |
492 | 'log_body' : log_body, | 503 | 'log_body' : log_body, |
493 | 'showing_matches' : False, | 504 | 'showing_matches' : False, |
505 | 'uri_list' : uri_list, | ||
494 | } | 506 | } |
495 | if request.GET.get( 'show_matches', "" ): | 507 | if request.GET.get( 'show_matches', "" ): |
496 | context[ 'showing_matches' ] = True | 508 | context[ 'showing_matches' ] = True |