From 225c644b3eaf60955070bd359039b3fdd7e78f5a Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 1 May 2014 23:33:17 +0100 Subject: [PATCH] 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. --- fdroidserver/build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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() -- 2.30.2