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

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index daf109dd05182397de52a3f38fe9c94be6789912..37febba9fafdd2bb7979a019ab16f07aeac7b3c0 100644 (file)
--- 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;"