mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'diff' into 'master'

Browse source 
Show \r when diffing reproducible apk

See merge request fdroid/fdroidserver!1529
This commit is contained in:
Hans-Christoph Steiner 2024-09-19 13:25:55 +00:00
commit 9a65e24930
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -3854,7 +3854,7 @@ def compare_apks(apk1, apk2, tmp_dir, log_dir=None):
if len(lines) != 1 or 'META-INF' not in lines[0]: if len(lines) != 1 or 'META-INF' not in lines[0]:
if set_command_in_config('meld'): if set_command_in_config('meld'):
p = FDroidPopen([config['meld'], apk1dir, apk2dir], output=False) p = FDroidPopen([config['meld'], apk1dir, apk2dir], output=False)
return "Unexpected diff output:\n" + p.output return "Unexpected diff output:\n" + p.output.replace("\r", "^M")
# since everything verifies, delete the comparison to keep cruft down # since everything verifies, delete the comparison to keep cruft down
shutil.rmtree(apk1dir) shutil.rmtree(apk1dir)