From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 16 Nov 2013 11:54:23 +0000 (+0100)
Subject: Fix srclib subdir paths
X-Git-Tag: 0.1~181
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=64a7a5149e0a7bf8e1bac37c306a1438cee1b190;p=fdroidserver.git

Fix srclib subdir paths
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index cc922a32..195523f8 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1324,7 +1324,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, basepath=False,
 
     libdir = None
     if subdir is not None:
-        libdir = subdir
+        libdir = os.path.join(sdir, subdir)
     elif srclib["Subdir"] is not None:
         for subdir in srclib["Subdir"]:
             libdir_candidate = os.path.join(sdir, subdir)