Remove the other explicit vagrant references

Aside from the VM setup (which is now self-contained) the build process
only cares that it's handed a clean VM that it can access via ssh, given
a host/port/user/pubkey combination. There's no dependency outside the
getvm/releasevm functions on what kind of vm it is, what user the build
runs as, etc.

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 6c1eb90b446104d101167a109da25b9161033064..ccb846051414d3bbc29470fd34b0b797afb84f24 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -525,9 +525,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
     if onserver:
         manifest = os.path.join(root_dir, 'AndroidManifest.xml')
         if os.path.exists(manifest):
-            with open('/home/vagrant/buildserverid', 'r') as f:
+            homedir = os.path.expanduser('~')
+            with open(os.path.join(homedir, 'buildserverid'), 'r') as f:
                 buildserverid = f.read()
-            with open('/home/vagrant/fdroidserverid', 'r') as f:
+            with open(os.path.join(homedir, 'fdroidserverid'), 'r') as f:
                 fdroidserverid = f.read()
             with open(manifest, 'r') as f:
                 manifestcontent = f.read()