From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 4 Feb 2014 09:55:14 +0000 (+0100)
Subject: Fix vagrant popen error
X-Git-Tag: 0.2~326
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b8a841a7e487517883750fe8fa36dd326f53fa0e;p=fdroidserver.git

Fix vagrant popen error
---

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