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

Fix vagrant popen error

Browse source
This commit is contained in:
Daniel Martí 2014-02-04 10:55:14 +01:00
parent b8e48f32f7
commit b8a841a7e4
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/build.py
View file

@ -124,8 +124,9 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
shutil.rmtree('builder') shutil.rmtree('builder')
os.mkdir('builder') os.mkdir('builder')
p = FDroidPopen('vagrant --version', shell=True, stdout=subprocess.PIPE) p = subprocess.Popen('vagrant --version', shell=True, stdout=subprocess.PIPE)
if p.stdout.startswith('Vagrant version 1.2'): vver = p.communicate()[0]
if vver.startswith('Vagrant version 1.2'):
with open('builder/Vagrantfile', 'w') as vf: with open('builder/Vagrantfile', 'w') as vf:
vf.write('Vagrant.configure("2") do |config|\n') vf.write('Vagrant.configure("2") do |config|\n')
vf.write('config.vm.box = "buildserver"\n') vf.write('config.vm.box = "buildserver"\n')