From 2458577209b0cafbf0f12153abc14942e5953332 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 7 Jan 2015 20:09:03 +0100
Subject: [PATCH] if `meld` is available, use it to show differences on failed
 APK compare

meld is much easier to browse when comparing directory trees.
---
 fdroidserver/common.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index bfeb544d..2ea43885 100644
--- 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!
-- 
2.30.2