Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
b524f0e1
Commit
b524f0e1
authored
Jul 21, 2017
by
Ari Rizzitano
Committed by
GitHub
Jul 21, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15610 from edx/ari/fix-webpack-failures
catch WebpackLoaderBadStatsError in test runs
parents
f86f5998
038d5a13
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
common/djangoapps/pipeline_mako/templates/static_content.html
+3
-2
No files found.
common/djangoapps/pipeline_mako/templates/static_content.html
View file @
b524f0e1
...
@@ -93,6 +93,7 @@ source, template_path = Loader(engine).load_template_source(path)
...
@@ -93,6 +93,7 @@ source, template_path = Loader(engine).load_template_source(path)
</
%
doc>
</
%
doc>
<
%
<
%
from
django
.
template
import
Template
,
Context
from
django
.
template
import
Template
,
Context
from
webpack_loader
.
exceptions
import
WebpackLoaderBadStatsError
try:
try:
return
Template
("""
return
Template
("""
{%
load
render_bundle
from
webpack_loader
%}
{%
load
render_bundle
from
webpack_loader
%}
...
@@ -105,9 +106,9 @@ source, template_path = Loader(engine).load_template_source(path)
...
@@ -105,9 +106,9 @@ source, template_path = Loader(engine).load_template_source(path)
'entry': entry,
'entry': entry,
'body': capture(caller.body)
'body': capture(caller.body)
}))
}))
except
IOError
as e:
except
(IOError, WebpackLoaderBadStatsError)
as e:
# Don't break Mako template rendering if the bundle or webpack-stats can't be found, but log it
# Don't break Mako template rendering if the bundle or webpack-stats can't be found, but log it
logger.error(
e
)
logger.error(
'[LEARNER-1938] {error}'.format(error=e)
)
%>
%>
</
%
def>
</
%
def>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment