From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 10 Aug 2014 17:56:45 +0000 (+0200)
Subject: Don't assume that Result: will be in the first line
X-Git-Tag: 0.3.0~95
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7c0185fab56b4589d82c77d5d9b42970fb3a84e3;p=fdroidserver.git

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

Fixes nasty bugs with _JAVA_OPTIONS
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 87b5e54f..4d55f433 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -468,10 +468,14 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 sys.exit(1)
             p = FDroidPopen(['java', '-cp', os.path.join(os.path.dirname(__file__), 'getsig'),
                              '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")
                 sys.exit(1)
-            thisinfo['sig'] = p.output[7:].strip()
 
             apk = zipfile.ZipFile(apkfile, 'r')