From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 15 Apr 2014 09:50:02 +0000 (+0200)
Subject: Fix apk path on gradle builds with many subdirs
X-Git-Tag: 0.2~129
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5c483a5484670a1a7364b73820222ba6bac0821e;p=fdroidserver.git

Fix apk path on gradle builds with many subdirs
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 9a47124a..617bec41 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -682,7 +682,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         dd = build_dir
         if 'subdir' in thisbuild:
             dd = os.path.join(dd, thisbuild['subdir'])
-            basename = thisbuild['subdir']
+            basename = os.path.basename(thisbuild['subdir'])
         if '@' in thisbuild['gradle']:
             dd = os.path.join(dd, thisbuild['gradle'].split('@')[1])
             basename = app['id']