From c941bf3215920b8644865e1cf6df9b627a80c29d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 30 Apr 2015 23:39:58 -0400 Subject: [PATCH] server: support plain paths as a serverwebroot For use cases where there is a web server running on the same machine where the `fdroid update` is being run, allow plain paths in the serverwebroot list. This is useful for debug repos from build servers, like: https://dev.guardianproject.info/fdroid --- fdroidserver/server.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fdroidserver/server.py b/fdroidserver/server.py index 5a0a442a..93447767 100644 --- a/fdroidserver/server.py +++ b/fdroidserver/server.py @@ -226,7 +226,15 @@ def main(): standardwebroot = True for serverwebroot in config.get('serverwebroot', []): - host, fdroiddir = serverwebroot.rstrip('/').split(':') + # this supports both an ssh host:path and just a path + s = serverwebroot.rstrip('/').split(':') + if len(s) == 1: + fdroiddir = s[0] + elif len(s) == 2: + host, fdroiddir = s + else: + logging.error('Malformed serverwebroot line: ' + serverwebroot) + sys.exit(1) repobase = os.path.basename(fdroiddir) if standardwebroot and repobase != 'fdroid': logging.error('serverwebroot path does not end with "fdroid", '