From fb47091de1f40019ca52a211131871018506f188 Mon Sep 17 00:00:00 2001 From: ianb Date: Thu, 21 Jul 2005 21:14:58 +0000 Subject: load defaults and get output directory from conf --- paste/app_templates/webkit_zpt_tmpl/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'paste') diff --git a/paste/app_templates/webkit_zpt_tmpl/__init__.py b/paste/app_templates/webkit_zpt_tmpl/__init__.py index dff1b60..d5275a4 100644 --- a/paste/app_templates/webkit_zpt_tmpl/__init__.py +++ b/paste/app_templates/webkit_zpt_tmpl/__init__.py @@ -22,9 +22,11 @@ class CommandServlet(app_setup.Command): else: servlet_name = servlet_fn if self.runner.server_conf_fn: - output_dir = os.path.dirname(self.runner.server_conf_fn) - config = pyconfig.Config() + config = pyconfig.Config(with_default=True) config.load(self.runner.server_conf_fn) + output_dir = config.get('base_dir') + if output_dir is None: + output_dir = os.path.dirname(self.runner.server_conf_fn) else: output_dir = os.getcwd() source_dir = os.path.join(self.template_dir, 'servlet_template') -- cgit v1.2.1