From b0a5ec5c1a84fb02bbe25ab985d9ca1efc6bd676 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 25 May 2018 10:00:32 +0200 Subject: [PATCH] workaround crash in diffoscope when verifying APKs On versions of diffoscope before 87, like the version included in Ubuntu xenial LTS, it would crash saying: ValueError: max_diff_block_lines (100) cannot be smaller than max_page_diff_block_lines (128) https://bugs.debian.org/875451 --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index f99f2824..51fef39b 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -2788,7 +2788,7 @@ def compare_apks(apk1, apk2, tmp_dir, log_dir=None): htmlfile = logfilename + '.diffoscope.html' textfile = logfilename + '.diffoscope.txt' if subprocess.call([config['diffoscope'], - '--max-report-size', '12345678', '--max-diff-block-lines', '100', + '--max-report-size', '12345678', '--max-diff-block-lines', '128', '--html', htmlfile, '--text', textfile, absapk1, absapk2]) != 0: return("Failed to run diffoscope " + apk1)