getnikola · May 12, 2015 · May 12, 2015 · May 12, 2015 · May 12, 2015 · May 12, 2015
Showing with 4 additions and 0 deletions.

+2 −0 AUTHORS.txt

+1 −0 nikola/__main__.py

+1 −0 nikola/nikola.py
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -102,3 +102,5 @@ pwm1234 <https://github.com/pwm1234>
 rafacarrascosa <https://github.com/rafacarrascosa>
 yarko <https://github.com/yarko>
 小明 <https://github.com/dongweiming>
+Brad Miller <https://github.com/bnmnetp>
+
diff --git a/nikola/__main__.py b/nikola/__main__.py
@@ -252,6 +252,7 @@ def load_tasks(self, cmd, opt_values, pos_args):
                 'outfile': sys.stderr,
             }
         DOIT_CONFIG['default_tasks'] = ['render_site', 'post_render']
+        DOIT_CONFIG.update(self.nikola._doit_config)
         tasks = generate_tasks(
             'render_site',
             self.nikola.gen_tasks('render_site', "Task", 'Group of tasks to render the site.'))

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -286,6 +286,7 @@ def __init__(self, **config):
         self.colorful = config.pop('__colorful__', False)
         self.invariant = config.pop('__invariant__', False)
         self.quiet = config.pop('__quiet__', False)
+        self._doit_config = config.pop('DOIT_CONFIG', {})
         self.original_cwd = config.pop('__cwd__', False)
         self.configuration_filename = config.pop('__configuration_filename__', False)
         self.configured = bool(config)