mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-14 02:50:12 +01:00
Try to fix srclibs for the BS
This commit is contained in:
parent
f4140a17c3
commit
b6f5c15a7c
@ -1297,11 +1297,17 @@ def parse_srclib(metafile, **kw):
|
|||||||
def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, basepath=False,
|
def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, basepath=False,
|
||||||
raw=False, prepare=True, preponly=False):
|
raw=False, prepare=True, preponly=False):
|
||||||
|
|
||||||
|
number = None
|
||||||
|
subdir = None
|
||||||
if raw:
|
if raw:
|
||||||
name = spec
|
name = spec
|
||||||
ref = None
|
ref = None
|
||||||
else:
|
else:
|
||||||
name, ref = spec.split('@')
|
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")
|
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:
|
if not preponly:
|
||||||
vcs = getvcs(srclib["Repo Type"], srclib["Repo"], sdir)
|
vcs = getvcs(srclib["Repo Type"], srclib["Repo"], sdir)
|
||||||
vcs.srclib = (name, sdir)
|
vcs.srclib = (name, number, sdir)
|
||||||
if ref:
|
if ref:
|
||||||
vcs.gotorevision(ref)
|
vcs.gotorevision(ref)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user