summaryrefslogtreecommitdiffstats
path: root/nikola/plugins/task/bundles.py
diff options
context:
space:
mode:
Diffstat (limited to 'nikola/plugins/task/bundles.py')
-rw-r--r--nikola/plugins/task/bundles.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/nikola/plugins/task/bundles.py b/nikola/plugins/task/bundles.py
index b9c57b9..e709133 100644
--- a/nikola/plugins/task/bundles.py
+++ b/nikola/plugins/task/bundles.py
@@ -40,7 +40,6 @@ from nikola import utils
class BuildBundles(LateTask):
-
"""Bundle assets using WebAssets."""
name = "create_bundles"
@@ -52,6 +51,7 @@ class BuildBundles(LateTask):
utils.req_missing(['webassets'], 'USE_BUNDLES', optional=True)
self.logger.warn('Setting USE_BUNDLES to False.')
site.config['USE_BUNDLES'] = False
+ site._GLOBAL_CONTEXT['use_bundles'] = False
super(BuildBundles, self).set_site(site)
def gen_tasks(self):
@@ -100,7 +100,11 @@ class BuildBundles(LateTask):
files.append(os.path.join(dname, fname))
file_dep = [os.path.join(kw['output_folder'], fname)
for fname in files if
- utils.get_asset_path(fname, self.site.THEMES, self.site.config['FILES_FOLDERS']) or fname == os.path.join('assets', 'css', 'code.css')]
+ utils.get_asset_path(
+ fname,
+ self.site.THEMES,
+ self.site.config['FILES_FOLDERS'],
+ output_dir=kw['output_folder']) or fname == os.path.join('assets', 'css', 'code.css')]
# code.css will be generated by us if it does not exist in
# FILES_FOLDERS or theme assets. It is guaranteed that the
# generation will happen before this task.