diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-09-25 16:10:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-29 14:11:59 +0100 |
commit | 39ca8b429b6244e9649e7303cbb240adf007bf22 (patch) | |
tree | 1b9bfecb4798c1987caa0178eda2d046634c0ae6 | |
parent | d6709b013364737bec7d59edd949db3891a6a8fa (diff) | |
download | poky-39ca8b429b6244e9649e7303cbb240adf007bf22.tar.gz |
bitbake: toastergui fix size rendering in dirinfo page
We fix the rendering of the size field in dirinfo-related pages
by directly calling filtered_filesizeformat and not rendering
it through the template engine.
Additionally, we enable error dumping into logs if an
Exception happens.
[YOCTO #6669]
(Bitbake rev: afa2431c21b8271b05dc4cca4265f98d9f338007)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 |