From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 30 Nov 2017 13:02:02 +0000 (+0100)
Subject: mirror: fix syntax error on Python 3.4
X-Git-Tag: 1.0.0~58
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bf09109c499a19f5f7220e90a5bd9c5f36e76b5d;p=fdroidserver.git

mirror: fix syntax error on Python 3.4

It seems that Python 3.5 is more flexible with * expansion, Python 3.4 says:

SyntaxError: only named arguments may follow *expression
https://travis-ci.org/f-droid/fdroidserver/jobs/309194065
---

diff --git a/fdroidserver/mirror.py b/fdroidserver/mirror.py
index 06595a44..0aa43722 100644
--- a/fdroidserver/mirror.py
+++ b/fdroidserver/mirror.py
@@ -157,7 +157,8 @@ def main():
                     for k in update.GRAPHIC_NAMES:
                         f = d.get(k)
                         if f:
-                            urls.append(_append_to_url_path(*components, f))
+                            filepath_tuple = components + (f, )
+                            urls.append(_append_to_url_path(*filepath_tuple))
                     _run_wget(os.path.join(basedir, *components), urls)
                     for k in update.SCREENSHOT_DIRS:
                         urls = []
@@ -165,7 +166,8 @@ def main():
                         if filelist:
                             components = (section, app['packageName'], locale, k)
                             for f in filelist:
-                                urls.append(_append_to_url_path(*components, f))
+                                filepath_tuple = components + (f, )
+                                urls.append(_append_to_url_path(*filepath_tuple))
                             _run_wget(os.path.join(basedir, *components), urls)
 
         urls = dict()