From b6f5c15a7c03526a28e939387910965cb135c0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 18 Nov 2013 22:31:52 +0100 Subject: [PATCH] Try to fix srclibs for the BS --- fdroidserver/common.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 1567bf7d..1033d17d 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1297,11 +1297,17 @@ def parse_srclib(metafile, **kw): def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, basepath=False, raw=False, prepare=True, preponly=False): + number = None + subdir = None if raw: name = spec ref = None else: name, ref = spec.split('@') + if ':' in name: + number, name = name.split(':', 1) + if '/' in name: + name, subdir = name.split('/',1) srclib_path = os.path.join('srclibs', name + ".txt") @@ -1314,7 +1320,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, basepath=False, if not preponly: vcs = getvcs(srclib["Repo Type"], srclib["Repo"], sdir) - vcs.srclib = (name, sdir) + vcs.srclib = (name, number, sdir) if ref: vcs.gotorevision(ref)