From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 17 Jun 2013 20:49:43 +0000 (+0100)
Subject: Helpful error message when aapt missing
X-Git-Tag: 0.1~532
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9b28d1ef1c19f4a3f4dc0500c6c672b86f114b43;p=fdroidserver.git

Helpful error message when aapt missing
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index ee25daf6..eca4cbda 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -266,7 +266,10 @@ def scan_apks(apps, apkcache, repodir, knownapks):
             thisinfo['size'] = os.path.getsize(apkfile)
             thisinfo['permissions'] = []
             thisinfo['features'] = []
-            p = subprocess.Popen([os.path.join(sdk_path, 'platform-tools', 'aapt'),
+            if not os.path.exists(aapt_path):
+                print "Missing aapt - check aapt_path in your config"
+                sys.exit(1)
+            p = subprocess.Popen([aapt_path,
                                   'dump', 'badging', apkfile],
                                  stdout=subprocess.PIPE)
             output = p.communicate()[0]