From 911e86fc874f7721ad53f3bf48618e88949c1692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Thu, 16 Apr 2020 11:32:37 +0200 Subject: [PATCH] support copying yml srclibs to buildserver vm during builds --- fdroidserver/build.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index dbcccde6..41467533 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -203,8 +203,18 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force): send_dir(lib) # Copy the metadata file too... ftp.chdir(posixpath.join(homedir, 'srclibs')) - ftp.put(os.path.join('srclibs', name + '.txt'), - name + '.txt') + if os.path.isfile(os.path.join('srclibs', name + '.yml')): + ftp.put(os.path.join('srclibs', name + '.yml'), + name + '.yml') + elif os.path.isfile(os.path.join('srclibs', name + '.txt')): + ftp.put(os.path.join('srclibs', name + '.txt'), + name + '.txt') + else: + raise BuildException("can not find metadata file for " + "'{name}', please make sure it is " + "present in your 'srclibs' folder." + "(supported formats: txt, yml)" + .format(name=name)) # Copy the main app source code # (no need if it's a srclib) if (not basesrclib) and os.path.exists(build_dir):