From 9bf9159a771375a92625669ea6a5606ad13f1abf Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 16 Apr 2018 23:36:12 +0200 Subject: [PATCH] update: use only 7 chars of SHA256 for non-APK version name #460 --- fdroidserver/update.py | 2 +- tests/repo/index-v1.json | 2 +- tests/repo/index.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index c79c6d52..d7f21e4b 100644 --- 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 e572088e..90d586ce 100644 --- 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 32b15b5f..60136572 100644 --- a/tests/repo/index.xml +++ b/tests/repo/index.xml @@ -57,7 +57,7 @@ 0.2.1 2000 - 897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c + 897a92a 1234 fake.ota.update_1234.zip 897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c