From d7e6f5ea7716050634663318e2be79f58fd5f150 Mon Sep 17 00:00:00 2001
From: ianb <devnull@localhost>
Date: Thu, 21 Jul 2005 21:15:32 +0000
Subject: Go up to higher-level directories to find server.conf

---
 paste/app_setup.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'paste/app_setup.py')

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')
-- 
cgit v1.2.1