From da31120b5ad361b9dda28e0a97bf066499f805e6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 24 Aug 2020 16:23:13 +0200 Subject: [PATCH] build: refactor missing srclibs error reporting for only .yml --- fdroidserver/build.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index ecf466c2..31ef0d0c 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -203,15 +203,12 @@ 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')) - if os.path.isfile(os.path.join('srclibs', name + '.yml')): - ftp.put(os.path.join('srclibs', name + '.yml'), - name + '.yml') + srclibsfile = os.path.join('srclibs', name + '.yml') + if os.path.isfile(srclibsfile): + ftp.put(srclibsfile, os.path.basename(srclibsfile)) else: - raise BuildException("can not find metadata file for " - "'{name}', please make sure it is " - "present in your 'srclibs' folder." - "(supported format: yml)" - .format(name=name)) + raise BuildException(_('cannot find required srclibs: "{path}"') + .format(path=srclibsfile)) # Copy the main app source code # (no need if it's a srclib) if (not basesrclib) and os.path.exists(build_dir):