build: check that metadata is present before creating tmp dirs

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 6f476625f84944a9b5421cc71667076a87b93b70..a4fbd6d91b448da5776b6cab0484cffc0f078388 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -58,7 +58,7 @@ config = {
     'boot_timeout': 600,
     'cachedir': cachedir,
     'cpus': 1,
-    'memory': 3584,
+    'memory': 1024,
 }
 
 # load config file, if present
@@ -392,6 +392,7 @@ vagrantfile += """
         :sdk_loc => "/home/vagrant/android-sdk",
         :ndk_loc => "/home/vagrant/android-ndk",
         :debian_mirror => "%s",
+        :ubuntu_trusty => "%s",
         :user => "vagrant"
       }
     }
@@ -402,7 +403,8 @@ vagrantfile += """
     chef.add_recipe "kivy"
   end
 end
-""" % (config['debian_mirror'])
+""" % (config['debian_mirror'],
+       str('14.04' in os.uname()[3]).lower())
 
 # Check against the existing Vagrantfile, and if they differ, we need to
 # create a new box: