From e404abce21185e735c5315bae740c173aba3b282 Mon Sep 17 00:00:00 2001 From: Tias Guns Date: Wed, 14 Mar 2012 23:59:05 +0000 Subject: [PATCH] Fine-tune error reporting of vercode mismatch I had a recipe that used 'Build Version: 0.1,2,...' with a ' ' between the : and the version number. This failed in uncomprehensible ways untill I figured the above out. Perhaps a better solution would be to make the parser insensitive to spaces between the ':' and what's after it? --- fdroidserver/build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index c341dda5..f46f6c7d 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -240,9 +240,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir, if (version != thisbuild['version'] or vercode != thisbuild['vercode']): - raise BuildException(("Unexpected version/version code in output" - "APK: %s / %s" - "Expected: %s / %s") + raise BuildException(("Unexpected version/version code in output;" + " APK: '%s' / '%s'" + " Expected: '%s' / '%s'") % (version, str(vercode), thisbuild['version'], str(thisbuild['vercode'])) )