From 9b28d1ef1c19f4a3f4dc0500c6c672b86f114b43 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 17 Jun 2013 21:49:43 +0100
Subject: [PATCH] Helpful error message when aapt missing

---
 fdroidserver/update.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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]