mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle multiple uses of extlib subdirectory

Browse source
This commit is contained in:
Ciaran Gultnieks 2013-03-05 19:47:52 +00:00
parent a30aa01253
commit a3e0e082c3
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/build.py
View file

@ -87,8 +87,9 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
# Open SSH connection to make sure it's working and ready... # Open SSH connection to make sure it's working and ready...
print "Connecting to virtual machine..." print "Connecting to virtual machine..."
subprocess.call('vagrant ssh-config >sshconfig', if subprocess.call('vagrant ssh-config >sshconfig',
cwd='builder', shell=True) cwd='builder', shell=True) != 0:
raise BuildException("Error getting ssh config")
vagranthost = 'default' # Host in ssh config file vagranthost = 'default' # Host in ssh config file
sshconfig = ssh.SSHConfig() sshconfig = ssh.SSHConfig()
sshf = open('builder/sshconfig', 'r') sshf = open('builder/sshconfig', 'r')
@ -191,7 +192,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
for lib in thisbuild['extlibs'].split(';'): for lib in thisbuild['extlibs'].split(';'):
lp = lib.split('/') lp = lib.split('/')
for d in lp[:-1]: for d in lp[:-1]:
ftp.mkdir(d) if d not in ftp.listdir():
ftp.mkdir(d)
ftp.chdir(d) ftp.chdir(d)
ftp.put(os.path.join('build/extlib', lib), lp[-1]) ftp.put(os.path.join('build/extlib', lib), lp[-1])
for _ in lp[:-1]: for _ in lp[:-1]: