diff options
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index defbbbfa4c..ea81423d51 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
| @@ -742,7 +742,6 @@ class LazyEncoder(json.JSONEncoder): | |||
| 742 | return super(LazyEncoder, self).default(obj) | 742 | return super(LazyEncoder, self).default(obj) |
| 743 | 743 | ||
| 744 | from toastergui.templatetags.projecttags import filtered_filesizeformat | 744 | from toastergui.templatetags.projecttags import filtered_filesizeformat |
| 745 | from django import template | ||
| 746 | import os | 745 | import os |
| 747 | def _get_dir_entries(build_id, target_id, start): | 746 | def _get_dir_entries(build_id, target_id, start): |
| 748 | node_str = { | 747 | node_str = { |
| @@ -797,9 +796,7 @@ def _get_dir_entries(build_id, target_id, start): | |||
| 797 | # don't use resolved path from above, show immediate link-to | 796 | # don't use resolved path from above, show immediate link-to |
| 798 | if o.sym_target_id != "" and o.sym_target_id != None: | 797 | if o.sym_target_id != "" and o.sym_target_id != None: |
| 799 | entry['link_to'] = Target_File.objects.get(pk=o.sym_target_id).path | 798 | entry['link_to'] = Target_File.objects.get(pk=o.sym_target_id).path |
| 800 | t = template.Template('{% load projecttags %} {{ size|filtered_filesizeformat }}') | 799 | entry['size'] = filtered_filesizeformat(o.size) |
| 801 | c = template.Context({'size': o.size}) | ||
| 802 | entry['size'] = str(t.render(c)) | ||
| 803 | if entry['link_to'] != None: | 800 | if entry['link_to'] != None: |
| 804 | entry['permission'] = node_str[o.inodetype] + o.permission | 801 | entry['permission'] = node_str[o.inodetype] + o.permission |
| 805 | else: | 802 | else: |
| @@ -808,7 +805,10 @@ def _get_dir_entries(build_id, target_id, start): | |||
| 808 | entry['group'] = o.group | 805 | entry['group'] = o.group |
| 809 | response.append(entry) | 806 | response.append(entry) |
| 810 | 807 | ||
| 811 | except: | 808 | except Exception as e: |
| 809 | print "Exception ", e | ||
| 810 | import traceback | ||
| 811 | traceback.print_exc(e) | ||
| 812 | pass | 812 | pass |
| 813 | 813 | ||
| 814 | # sort by directories first, then by name | 814 | # sort by directories first, then by name |
