mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 07:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the other explicit vagrant references

Browse source 
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.
This commit is contained in:
Ciaran Gultnieks 2014-05-01 23:33:17 +01:00
parent ee157b7c83
commit 225c644b3e
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/build.py
View file

@ -525,9 +525,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
if onserver: if onserver:
manifest = os.path.join(root_dir, 'AndroidManifest.xml') manifest = os.path.join(root_dir, 'AndroidManifest.xml')
if os.path.exists(manifest): 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() buildserverid = f.read()
with open('/home/vagrant/fdroidserverid', 'r') as f: with open(os.path.join(homedir, 'fdroidserverid'), 'r') as f:
fdroidserverid = f.read() fdroidserverid = f.read()
with open(manifest, 'r') as f: with open(manifest, 'r') as f:
manifestcontent = f.read() manifestcontent = f.read()