Improve error output for missing extlibs

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index e260d585958254be08f032f3fe5ace580af9ec71..546c4637818f5b738bf5267ded8ee0d548092495 100644 (file)
--- 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 f51433f6c3fe2c2eedf96d3ff7d0e13a9f16ba9a..3e394354525e8fbf48c85ff7fcee331808b89a10 100644 (file)
--- 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 = []