1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 11:00:10 +01:00

Fix indexing issue with recursive srclibs

This commit is contained in:
Daniel Martí 2014-03-31 19:23:48 +02:00
parent 214d63e48f
commit caa88ec388

View File

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