mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'libvirt' into 'master'

Browse source 
libvirt: various fixes related to the `makebuildserver` and `fdroid build` commands

See merge request fdroid/fdroidserver!718
This commit is contained in:
Hans-Christoph Steiner 2020-03-09 15:06:19 +00:00
commit b8ddc43f95
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -710,7 +710,7 @@ def write_status_json(output, pretty=False, name=None):
"""Write status out as JSON, and rsync it to the repo server""" """Write status out as JSON, and rsync it to the repo server"""
status_dir = os.path.join('repo', 'status') status_dir = os.path.join('repo', 'status')
if not os.path.exists(status_dir): if not os.path.exists(status_dir):
os.mkdir(status_dir) os.makedirs(status_dir)
if not name: if not name:
output['endTimestamp'] = int(datetime.now(timezone.utc).timestamp() * 1000) output['endTimestamp'] = int(datetime.now(timezone.utc).timestamp() * 1000)
name = sys.argv[0].split()[1] # fdroid subcommand name = sys.argv[0].split()[1] # fdroid subcommand

1
fdroidserver/vmtools.py
View file

@ -122,6 +122,7 @@ def get_build_vm(srvdir, provider=None):
# try guessing provider from installed software # try guessing provider from installed software
kvm_installed = shutil.which('kvm') is not None kvm_installed = shutil.which('kvm') is not None
kvm_installed |= shutil.which('qemu') is not None kvm_installed |= shutil.which('qemu') is not None
kvm_installed |= shutil.which('qemu-kvm') is not None
vbox_installed = shutil.which('VBoxHeadless') is not None vbox_installed = shutil.which('VBoxHeadless') is not None
if kvm_installed and vbox_installed: if kvm_installed and vbox_installed:
logging.debug('both kvm and vbox are installed.') logging.debug('both kvm and vbox are installed.')