From c75aa26115fb22e0dfb7cfd9636342d465a6f1a1 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 12 Nov 2013 20:14:16 +0000 Subject: [PATCH] Improve error output for missing extlibs --- fdroidserver/build.py | 5 ++++- fdroidserver/common.py | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index e260d585..546c4637 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -241,12 +241,15 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force): ftp.chdir('/home/vagrant/build/extlib') for lib in thisbuild['extlibs'].split(';'): lib = lib.strip() + libsrc = os.path.join('build/extlib', lib) + if not os.path.exists(libsrc): + raise BuildException("Missing extlib {0}".format(libsrc)) lp = lib.split('/') for d in lp[:-1]: if d not in ftp.listdir(): ftp.mkdir(d) ftp.chdir(d) - ftp.put(os.path.join('build/extlib', lib), lp[-1]) + ftp.put(libsrc, lp[-1]) for _ in lp[:-1]: ftp.chdir('..') # Copy any srclibs that are required... diff --git a/fdroidserver/common.py b/fdroidserver/common.py index f51433f6..3e394354 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1607,9 +1607,13 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= os.mkdir(libsdir) for lib in build['extlibs'].split(';'): lib = lib.strip() + if options.verbose: + print "...installing extlib {0}".format(lib) libf = os.path.basename(lib) - shutil.copyfile(os.path.join(extlib_dir, lib), - os.path.join(libsdir, libf)) + libsrc = os.path.join(extlib_dir, lib) + if not os.path.exists(libsrc): + raise BuildException("Missing extlib file {0}".format(libsrc)) + shutil.copyfile(libsrc, os.path.join(libsdir, libf)) # Get required source libraries... srclibpaths = [] -- 2.30.2