update: use only 7 chars of SHA256 for non-APK version name

#460

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index c79c6d52fdd578bcf74935c2d485cd9722832fcb..d7f21e4b458e974e86ad0ae5929d5f04a64ddc7c 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -993,7 +993,7 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
             repo_file['hash'] = shasum
             repo_file['hashType'] = 'sha256'
             repo_file['versionCode'] = 0
-            repo_file['versionName'] = shasum
+            repo_file['versionName'] = shasum[0:7]
             # the static ID is the SHA256 unless it is set in the metadata
             repo_file['packageName'] = shasum
 

diff --git a/tests/repo/index-v1.json b/tests/repo/index-v1.json
index e572088e8983832260e3e3a0ac95d159ced5218e..90d586ce08a5b20b8d7ba398429a17f11adae167 100644 (file)
--- a/tests/repo/index-v1.json
+++ b/tests/repo/index-v1.json
@@ -349,7 +349,7 @@
         "packageName": "fake.ota.update",
         "size": 233,
         "versionCode": 1234,
-        "versionName": "897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c"
+        "versionName": "897a92a"
       }
     ],
     "info.guardianproject.urzip": [

diff --git a/tests/repo/index.xml b/tests/repo/index.xml
index 32b15b5f4c15352aacb5deddf1bfb9d34c62c6cb..60136572da6641642a8d86d9c0e77cab2411cfce 100644 (file)
--- a/tests/repo/index.xml
+++ b/tests/repo/index.xml
@@ -57,7 +57,7 @@
                <marketversion>0.2.1</marketversion>
                <marketvercode>2000</marketvercode>
                <package>
-                       <version>897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c</version>
+                       <version>897a92a</version>
                        <versioncode>1234</versioncode>
                        <apkname>fake.ota.update_1234.zip</apkname>
                        <hash type="sha256">897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c</hash>