[yocto] [layerindex-web][PATCH 2/3] Fix output decoding/reporting for bulk change patch download
Paul Eggleton
paul.eggleton at linux.intel.com
Tue Aug 30 14:03:30 PDT 2016
With Python 3 we need to take care of decoding the output so we can
treat it as a string. At the same time, it's more useful to see the
output string rather than the exception if there is some output.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
layerindex/views.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/layerindex/views.py b/layerindex/views.py
index dfe4453..62f5268 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -237,8 +237,11 @@ def bulk_change_patch_view(request, pk):
except Exception as e:
output = getattr(e, 'output', None)
if output:
+ output = output.decode('utf-8', errors="ignore")
if 'timeout' in output:
return HttpResponse('Failed to generate patches: timed out waiting for lock. Please try again shortly.', content_type='text/plain')
+ else:
+ return HttpResponse('Failed to generate patches: %s' % output, content_type='text/plain')
return HttpResponse('Failed to generate patches: %s' % e, content_type='text/plain')
# FIXME better error handling
--
2.5.5
More information about the yocto
mailing list