summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpaste/server.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/paste/server.py b/paste/server.py
index c2297c2..b6a63e1 100755
--- a/paste/server.py
+++ b/paste/server.py
@@ -247,13 +247,17 @@ servers['console'] = console_server
def make_app(conf):
if conf.get('publish_dir'):
app = wsgiwebkit.webkit(conf['publish_dir'], use_lint=conf.get('lint'))
- elif conf.get('publish_application'):
- app = conf['publish_application']
+ elif conf.get('publish_app'):
+ app = conf['publish_app']
if isinstance(app, (str, unicode)):
from paste.util import import_string
app = import_string.eval_import(app)
else:
- print "You must provide publish_dir or publish_application"
+ # @@ ianb 2005-03-23: This should be removed sometime
+ if conf.get('webkit_dir'):
+ print 'The webkit_dir configuration variable is no longer supported'
+ print 'Use publish_dir instead'
+ print "You must provide publish_dir or publish_app"
sys.exit(2)
return config_middleware(app, conf)