From 74a785a888b497ff10edd519d7d92def439331c3 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 7 Jan 2015 19:56:55 +0100 Subject: [PATCH] uncompress using `jar xf` in a folder with the same name This makes it easier to compare the whole APK folders when there are multiple methods of uncompressing the APK. --- fdroidserver/common.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index a7b380fb..c8ed3756 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1886,14 +1886,15 @@ def compare_apks(apk1, apk2, tmp_dir): if os.path.exists(d): shutil.rmtree(d) os.mkdir(d) + os.mkdir(os.path.join(d, 'jar-xf')) if subprocess.call(['jar', 'xf', os.path.abspath(apk1)], - cwd=apk1dir) != 0: + cwd=os.path.join(apk1dir, 'jar-xf')) != 0: return("Failed to unpack " + apk1) if subprocess.call(['jar', 'xf', os.path.abspath(apk2)], - cwd=apk2dir) != 0: + cwd=os.path.join(apk2dir, 'jar-xf')) != 0: return("Failed to unpack " + apk2) p = FDroidPopen(['diff', '-r', apk1dir, apk2dir], output=False) -- 2.30.2