chiark / gitweb /
Fix vagrant popen error
authorDaniel Martí <mvdan@mvdan.cc>
Tue, 4 Feb 2014 09:55:14 +0000 (10:55 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 4 Feb 2014 09:55:14 +0000 (10:55 +0100)
fdroidserver/build.py

index bdf54ed2db63c4aa96d296539e7114f4cfa01d5e..dd669712f351fa18bfa4a5e188f5dad12513246f 100644 (file)
@@ -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')