mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-09 02:41:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't assume that Result: will be in the first line

Browse source 
Fixes nasty bugs with _JAVA_OPTIONS
This commit is contained in:
Daniel Martí 2014-08-10 19:56:45 +02:00
parent bf227948a9
commit 7c0185fab5
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/update.py
View file

@ -468,10 +468,14 @@ def scan_apks(apps, apkcache, repodir, knownapks):
sys.exit(1) sys.exit(1)
p = FDroidPopen(['java', '-cp', os.path.join(os.path.dirname(__file__), 'getsig'), p = FDroidPopen(['java', '-cp', os.path.join(os.path.dirname(__file__), 'getsig'),
'getsig', os.path.join(os.getcwd(), apkfile)]) 'getsig', os.path.join(os.getcwd(), apkfile)])
if p.returncode != 0 or not p.output.startswith('Result:'): thisinfo['sig'] = None
for line in p.output.splitlines():
if line.startswith('Result:'):
thisinfo['sig'] = line[7:].strip()
break
if p.returncode != 0 or not thisinfo['sig']:
logging.critical("Failed to get apk signature") logging.critical("Failed to get apk signature")
sys.exit(1) sys.exit(1)
thisinfo['sig'] = p.output[7:].strip()
apk = zipfile.ZipFile(apkfile, 'r') apk = zipfile.ZipFile(apkfile, 'r')