kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 22:40:12 +01:00
Code Activity

Fix PEP8 issues from latest pull request

Browse Source
This commit is contained in:
Ciaran Gultnieks 2015-01-13 08:26:30 +00:00
parent 12f65953e6
commit 24aaa568da
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdroidserver/common.py
View File

@ -1898,9 +1898,9 @@ def compare_apks(apk1, apk2, tmp_dir):
return("Failed to unpack " + apk2) return("Failed to unpack " + apk2)
# try to find apktool in the path, if it hasn't been manually configed # try to find apktool in the path, if it hasn't been manually configed
if not 'apktool' in config: if 'apktool' not in config:
tmp = find_command('apktool') tmp = find_command('apktool')
if not tmp is None: if tmp is not None:
config['apktool'] = tmp config['apktool'] = tmp
if 'apktool' in config: if 'apktool' in config:
if subprocess.call([config['apktool'], 'd', os.path.abspath(apk1), '--output', 'apktool'], if subprocess.call([config['apktool'], 'd', os.path.abspath(apk1), '--output', 'apktool'],
@ -1914,7 +1914,7 @@ def compare_apks(apk1, apk2, tmp_dir):
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') meld = find_command('meld')
if not meld is None: if meld is not None:
p = FDroidPopen(['meld', apk1dir, apk2dir], output=False) p = FDroidPopen(['meld', apk1dir, apk2dir], output=False)
return("Unexpected diff output - " + p.output) return("Unexpected diff output - " + p.output)