fnexe.com/pypiserver
1
0
Fork 0
forked from github.com/pypiserver
Code Pull Requests Activity

allow multiple roots in paste_app_factory

Browse Source
This commit is contained in:
Ralf Schmitt 2013-01-28 00:31:58 +01:00
parent ff6fcdce18
commit 6c8d1b55b7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pypiserver/__init__.py
View File

@ -30,10 +30,20 @@ def app(root=None,
def paste_app_factory(global_config, **local_conf):
import os
def _make_root(root):
root = root.strip()
if root.startswith("~"):
return os.path.expanduser(root)
return root
root = local_conf.get("root")
if root and root.startswith("~"):
root = os.path.expanduser(root)
if root:
roots = [_make_root(x) for x in root.split("\n") if x.strip()]
else:
roots = None
redirect_to_fallback = local_conf.get("redirect_to_fallback", "").lower() in ("yes", "on", "1")
fallback_url = local_conf.get("fallback_url")
password_file = local_conf.get("password_file")
return app(root=root, redirect_to_fallback=redirect_to_fallback, fallback_url=fallback_url, password_file=password_file)
return app(root=roots, redirect_to_fallback=redirect_to_fallback, fallback_url=fallback_url, password_file=password_file)