mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename PopenResult.stdout to output since it also contains stderr

Browse source
This commit is contained in:
Daniel Martí 2014-07-01 18:04:41 +02:00
parent 22f4ed4b7a
commit 8888962ace
6 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/install.py
View file

@ -34,8 +34,8 @@ config = None
def devices():
p = FDroidPopen(["adb", "devices"])
if p.returncode != 0:
raise Exception("An error occured when finding devices: %s" % p.stdout)
lines = p.stdout.splitlines()
raise Exception("An error occured when finding devices: %s" % p.output)
lines = p.output.splitlines()
if lines[0].startswith('* daemon not running'):
lines = lines[2:]
if len(lines) < 3:
@ -102,7 +102,7 @@ def main():
logging.info("Installing %s on %s..." % (apk, dev))
p = FDroidPopen(["adb", "-s", dev, "install", apk])
fail = ""
for line in p.stdout.splitlines():
for line in p.output.splitlines():
if line.startswith("Failure"):
fail = line[9:-1]
if not fail: