projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d96da1f
)
[IMP] join stdout and stderr in error report when sass returncode>0
author
Fabien Meghazi
<fme@openerp.com>
Tue, 1 Jul 2014 16:38:01 +0000
(18:38 +0200)
committer
Fabien Meghazi
<fme@openerp.com>
Tue, 1 Jul 2014 16:38:01 +0000
(18:38 +0200)
openerp/addons/base/ir/ir_qweb.py
patch
|
blob
|
history
diff --git
a/openerp/addons/base/ir/ir_qweb.py
b/openerp/addons/base/ir/ir_qweb.py
index
aa58ef6
..
279a8eb
100644
(file)
--- a/
openerp/addons/base/ir/ir_qweb.py
+++ b/
openerp/addons/base/ir/ir_qweb.py
@@
-1198,7
+1198,7
@@
class AssetsBundle(object):
return
result = compiler.communicate(input=source.encode('utf-8'))
if compiler.returncode:
- error = self.get_sass_error(result[1], source=source)
+ error = self.get_sass_error(''.join(result), source=source)
_logger.warning(error)
self.css_errors.append(error)
return