From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 1 May 2014 22:33:17 +0000 (+0100)
Subject: Remove the other explicit vagrant references
X-Git-Tag: 0.2~93
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=225c644b3eaf60955070bd359039b3fdd7e78f5a;p=fdroidserver.git

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 6c1eb90b..ccb84605 100644
--- 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()