mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-08-15 10:50:09 +02:00
libvirt: various fixes related to the makebuildserver
and fdroid build
commands
This commit is contained in:
parent
5e0c8d5a46
commit
2d63ab66f5
@ -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"""
|
||||
status_dir = os.path.join('repo', 'status')
|
||||
if not os.path.exists(status_dir):
|
||||
os.mkdir(status_dir)
|
||||
os.makedirs(status_dir)
|
||||
if not name:
|
||||
output['endTimestamp'] = int(datetime.now(timezone.utc).timestamp() * 1000)
|
||||
name = sys.argv[0].split()[1] # fdroid subcommand
|
||||
|
@ -122,6 +122,7 @@ def get_build_vm(srvdir, provider=None):
|
||||
# try guessing provider from installed software
|
||||
kvm_installed = shutil.which('kvm') 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
|
||||
if kvm_installed and vbox_installed:
|
||||
logging.debug('both kvm and vbox are installed.')
|
||||
|
Loading…
Reference in New Issue
Block a user