kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 02:50:12 +01:00
Code Activity

Fix remaining srclib issues

Browse Source
This commit is contained in:
Daniel Martí 2013-11-16 22:49:37 +01:00
parent 57c53125d0
commit 363d404cbf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/build.py
View File

@ -294,7 +294,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
basesrclib = vcs.getsrclib() basesrclib = vcs.getsrclib()
if basesrclib: if basesrclib:
srclibpaths.append(basesrclib) srclibpaths.append(basesrclib)
for name, lib in srclibpaths: for name, number, lib in srclibpaths:
if options.verbose: if options.verbose:
print "Sending srclib '" + lib + "'" print "Sending srclib '" + lib + "'"
ftp.chdir('/home/vagrant/build/srclib') ftp.chdir('/home/vagrant/build/srclib')
@ -453,7 +453,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
if 'build' in thisbuild: if 'build' in thisbuild:
cmd = common.replace_config_vars(thisbuild['build']) cmd = common.replace_config_vars(thisbuild['build'])
# Substitute source library paths into commands... # Substitute source library paths into commands...
for name, libpath in srclibpaths: for name, number, libpath in srclibpaths:
libpath = os.path.relpath(libpath, root_dir) libpath = os.path.relpath(libpath, root_dir)
cmd = cmd.replace('$$' + name + '$$', libpath) cmd = cmd.replace('$$' + name + '$$', libpath)
if options.verbose: if options.verbose: