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

run all SDK tools commands using SdkToolsPopen

Browse source
This commit is contained in:
Hans-Christoph Steiner 2014-12-09 15:15:36 +01:00
parent 9244256461
commit fa1cc48d57
5 changed files with 58 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/install.py
View file

@ -25,14 +25,14 @@ from optparse import OptionParser, OptionError
import logging
import common
from common import FDroidPopen, FDroidException
from common import SdkToolsPopen, FDroidException
options = None
config = None
def devices():
p = FDroidPopen([config['adb'], "devices"])
p = SdkToolsPopen(['adb', "devices"])
if p.returncode != 0:
raise FDroidException("An error occured when finding devices: %s" % p.output)
lines = p.output.splitlines()
@ -103,7 +103,7 @@ def main():
logging.info("Installing %s..." % apk)
for dev in devs:
logging.info("Installing %s on %s..." % (apk, dev))
p = FDroidPopen([config['adb'], "-s", dev, "install", apk])
p = SdkToolsPopen(['adb', "-s", dev, "install", apk])
fail = ""
for line in p.output.splitlines():
if line.startswith("Failure"):