chiark / gitweb /
Omit 'daemon not running' lines when using adb devices
authorDaniel Martí <mvdan@mvdan.cc>
Sat, 11 Jan 2014 12:39:11 +0000 (13:39 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Sat, 11 Jan 2014 12:39:11 +0000 (13:39 +0100)
This fixes the 'installing on *' bug that hangs f-droid forever

fdroidserver/install.py

index ca32137d7a9c21107cd7623533040ab13a568d06..85d6e34ae1c6fc11b6bbcef9098d7ea3adb87005 100644 (file)
@@ -34,6 +34,8 @@ def devices():
     if p.returncode != 0:
         raise Exception("An error occured when finding devices: %s" % p.stderr)
     lines = p.stdout.splitlines()
+    if lines[0].startswith('* daemon not running'):
+        lines = lines[2:]
     if len(lines) < 3:
         return []
     lines = lines[1:-1]