From b53746dc7ba3711ada12296a92ba13edae286293 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 7 Jan 2015 19:55:26 +0100 Subject: [PATCH] make resulting dirs of compare_apks() have clearer dir names This makes it a lot easier to remember which APK is which when trying to make sense of the differences. --- fdroidserver/common.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 3a95445a..a7b380fb 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1879,24 +1879,24 @@ def compare_apks(apk1, apk2, tmp_dir): trying to do the comparison. """ - thisdir = os.path.join(tmp_dir, 'this_apk') - thatdir = os.path.join(tmp_dir, 'that_apk') - for d in [thisdir, thatdir]: + badchars = re.compile('''[/ :;'"]''') + apk1dir = os.path.join(tmp_dir, badchars.sub('_', apk1[0:-4])) # trim .apk + apk2dir = os.path.join(tmp_dir, badchars.sub('_', apk2[0:-4])) # trim .apk + for d in [apk1dir, apk2dir]: if os.path.exists(d): shutil.rmtree(d) os.mkdir(d) if subprocess.call(['jar', 'xf', os.path.abspath(apk1)], - cwd=thisdir) != 0: + cwd=apk1dir) != 0: return("Failed to unpack " + apk1) if subprocess.call(['jar', 'xf', os.path.abspath(apk2)], - cwd=thatdir) != 0: + cwd=apk2dir) != 0: return("Failed to unpack " + apk2) - p = FDroidPopen(['diff', '-r', 'this_apk', 'that_apk'], cwd=tmp_dir, - output=False) + p = FDroidPopen(['diff', '-r', apk1dir, apk2dir], output=False) lines = p.output.splitlines() if len(lines) != 1 or 'META-INF' not in lines[0]: return("Unexpected diff output - " + p.output) -- 2.30.2