mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 07:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

if meld is available, use it to show differences on failed APK compare

Browse source 
meld is much easier to browse when comparing directory trees.
This commit is contained in:
Hans-Christoph Steiner 2015-01-07 20:09:03 +01:00
parent fc4679cebb
commit 2458577209
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fdroidserver/common.py
View file

@ -1913,6 +1913,9 @@ def compare_apks(apk1, apk2, tmp_dir):
p = FDroidPopen(['diff', '-r', apk1dir, apk2dir], output=False) p = FDroidPopen(['diff', '-r', apk1dir, apk2dir], output=False)
lines = p.output.splitlines() lines = p.output.splitlines()
if len(lines) != 1 or 'META-INF' not in lines[0]: if len(lines) != 1 or 'META-INF' not in lines[0]:
meld = find_command('meld')
if not meld is None:
p = FDroidPopen(['meld', apk1dir, apk2dir], output=False)
return("Unexpected diff output - " + p.output) return("Unexpected diff output - " + p.output)
# If we get here, it seems like they're the same! # If we get here, it seems like they're the same!