def devices():
- p = FDroidPopen(["adb", "devices"])
+ p = FDroidPopen([config['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:
parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
parser.add_option("-v", "--verbose", action="store_true", default=False,
help="Spew out even more information than normal")
+ parser.add_option("-q", "--quiet", action="store_true", default=False,
+ help="Restrict output to warnings and errors")
parser.add_option("-a", "--all", action="store_true", default=False,
help="Install all signed applications available")
(options, args) = parser.parse_args()
logging.info("Installing %s..." % apk)
for dev in devs:
logging.info("Installing %s on %s..." % (apk, dev))
- p = FDroidPopen(["adb", "-s", dev, "install", apk])
+ p = FDroidPopen([config['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: