From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 11 Jan 2014 12:39:11 +0000 (+0100)
Subject: Omit 'daemon not running' lines when using adb devices
X-Git-Tag: 0.1~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b70c41bef85ac26854d4f9b5a7ef197934d73cab;p=fdroidserver.git

Omit 'daemon not running' lines when using adb devices

This fixes the 'installing on *' bug that hangs f-droid forever
---

diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index ca32137d..85d6e34a 100644
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -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]