From 82e26cf59e69237f8d3b2b99c45f9ddb7ae13e47 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 22 Jan 2016 13:33:14 +0100 Subject: [PATCH] makebuildserver: use jessie32.box from cache, if present --- makebuildserver | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/makebuildserver b/makebuildserver index 4e575a09..ca2dc56f 100755 --- a/makebuildserver +++ b/makebuildserver @@ -46,11 +46,16 @@ parser.add_option("--debian-mirror", default="http://http.debian.net/debian/", options, args = parser.parse_args() # set up default config +cachedir = os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver') config = { 'arch64': False, 'basebox': 'jessie32', - 'baseboxurl': 'https://f-droid.org/jessie32.box', - 'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'), + # TODO in py3, convert this to pathlib.Path(absolute_path_string).as_uri() + 'baseboxurl': [ + 'file://' + os.path.join(cachedir, 'jessie32.box'), + 'https://f-droid.org/jessie32.box', + ], + 'cachedir': cachedir, 'cpus': 1, 'memory': 3584, }