From ab8d51012d0b36b9b927dbd613b5087eeba3452f Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 26 Oct 2016 20:41:37 +0200 Subject: [PATCH] use versionName unmodified as specified The versionName is defined as a string or string resource that can be any arbitrary data. fdroid should not second guess the developer here, and should just use the versionName unmodified. For anything that needs to compare different versions of apps, versionCode should always be used since that's what Android uses. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname --- fdroidserver/build.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index daf109dd..37febba9 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -860,14 +860,6 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir, if foundid != app.id: raise BuildException("Wrong package ID - build " + foundid + " but expected " + app.id) - # Some apps (e.g. Timeriffic) have had the bonkers idea of - # including the entire changelog in the version number. Remove - # it so we can compare. (TODO: might be better to remove it - # before we compile, in fact) - index = version.find(" //") - if index != -1: - version = version[:index] - if (version != build.version or vercode != build.vercode): raise BuildException(("Unexpected version/version code in output;"