summaryrefslogtreecommitdiff
path: root/paste/app_setup.py
diff options
context:
space:
mode:
Diffstat (limited to 'paste/app_setup.py')
-rw-r--r--paste/app_setup.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/paste/app_setup.py b/paste/app_setup.py
index 21b1eee..cf85e8c 100644
--- a/paste/app_setup.py
+++ b/paste/app_setup.py
@@ -74,9 +74,14 @@ def find_template_option(args):
return None, []
def find_template_config(args):
- conf_fn = os.path.join(os.getcwd(), 'server.conf')
- if not os.path.exists(conf_fn):
- return None, None
+ base = os.getcwd()
+ while 1:
+ conf_fn = os.path.join(base, 'server.conf')
+ if os.path.exists(conf_fn):
+ break
+ base, last_base = os.path.dirname(base), base
+ if last_base == base: # Root dir
+ return None, None
conf = pyconfig.Config(with_default=True)
conf.load(conf_fn)
return conf_fn, conf.get('app_template')