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

meld is much easier to browse when comparing directory trees.

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index bfeb544d7a1d0905cc0a6f3e4e943662df2b0c0b..2ea438850f4d461d4ce7fb65c5d9cd7079f3818d 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1913,6 +1913,9 @@ def compare_apks(apk1, apk2, tmp_dir):
     p = FDroidPopen(['diff', '-r', apk1dir, apk2dir], output=False)
     lines = p.output.splitlines()
     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)
 
     # If we get here, it seems like they're the same!