From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 31 Mar 2014 17:23:48 +0000 (+0200)
Subject: Fix indexing issue with recursive srclibs
X-Git-Tag: 0.2~160
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=caa88ec38838a3c1a4a71834cd65a101e378cf1e;p=fdroidserver.git

Fix indexing issue with recursive srclibs
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 6f234a56..5014a0be 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -861,7 +861,8 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None,
         libdir = sdir
 
     if srclib["Srclibs"]:
-        for n,lib in enumerate(srclib["Srclibs"].replace(';',',').split(',')):
+        n = 1
+        for lib in srclib["Srclibs"].replace(';',',').split(','):
             s_tuple = None
             for t in srclibpaths:
                 if t[0] == lib:
@@ -871,6 +872,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None,
                 raise BuildException('Missing recursive srclib %s for %s' % (
                     lib, name))
             place_srclib(libdir, n, s_tuple[2])
+            n += 1
 
     remove_signing_keys(sdir)
     remove_debuggable_flags(sdir)