1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-06 11:00:13 +02:00

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
This commit is contained in:
Hans-Christoph Steiner 2018-05-25 10:00:32 +02:00
parent 5afba57212
commit b0a5ec5c1a

View File

@ -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)