mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Centralise management of srclib metadata

Browse source
This commit is contained in:
Ciaran Gultnieks 2014-05-20 22:44:47 +01:00
parent e29da6b023
commit 3a73654d49
4 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
fdroidserver/common.py
View file

@ -280,10 +280,9 @@ def getvcs(vcstype, remote, local):
def getsrclibvcs(name):
srclib_path = os.path.join('srclibs', name + ".txt")
if not os.path.exists(srclib_path):
if not name in metadata.srclibs:
raise VCSException("Missing srclib " + name)
return metadata.parse_srclib(srclib_path)['Repo Type']
return metadata.srclibs[name]['Repo Type']
class vcs:
@ -940,12 +939,10 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None,
if '/' in name:
name, subdir = name.split('/', 1)
srclib_path = os.path.join('srclibs', name + ".txt")
if not os.path.exists(srclib_path):
if not name in metadata.srclibs:
raise BuildException('srclib ' + name + ' not found.')
srclib = metadata.parse_srclib(srclib_path)
srclib = metadata.srclibs[name]
sdir = os.path.join(srclib_dir, name)