chiark / gitweb /
Fix indexing issue with recursive srclibs
authorDaniel Martí <mvdan@mvdan.cc>
Mon, 31 Mar 2014 17:23:48 +0000 (19:23 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Mon, 31 Mar 2014 17:23:48 +0000 (19:23 +0200)
fdroidserver/common.py

index 6f234a569856314924a5684ed33964d2b3b71ed1..5014a0be13b3021143b9c9a1eb2d8446e5841c56 100644 (file)
@@ -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)