diff options
Diffstat (limited to 'nikola/plugins/task/bundles.py')
| -rw-r--r-- | nikola/plugins/task/bundles.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nikola/plugins/task/bundles.py b/nikola/plugins/task/bundles.py index 488f96f..b035b97 100644 --- a/nikola/plugins/task/bundles.py +++ b/nikola/plugins/task/bundles.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright © 2012-2013 Roberto Alsina and others. +# Copyright © 2012-2014 Roberto Alsina and others. # Permission is hereby granted, free of charge, to any # person obtaining a copy of this software and associated @@ -44,7 +44,9 @@ class BuildBundles(LateTask): def set_site(self, site): super(BuildBundles, self).set_site(site) - if webassets is None: + if webassets is None and self.site.config['USE_BUNDLES']: + utils.req_missing(['webassets'], 'USE_BUNDLES', optional=True) + utils.LOGGER.warn('Setting USE_BUNDLES to False.') self.site.config['USE_BUNDLES'] = False def gen_tasks(self): @@ -111,6 +113,6 @@ def get_theme_bundles(themes): for line in fd: name, files = line.split('=') files = [f.strip() for f in files.split(',')] - bundles[name.strip()] = files + bundles[name.strip().replace('/', os.sep)] = files break return bundles |