chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0f28c80
)
fix vm provider lookup flaw
author
Michael Pöhn
<michael.poehn@fsfe.org>
Sat, 25 Nov 2017 16:30:15 +0000
(17:30 +0100)
committer
Michael Pöhn
<michael.poehn@fsfe.org>
Sat, 25 Nov 2017 16:30:15 +0000
(17:30 +0100)
fdroidserver/vmtools.py
patch
|
blob
|
history
diff --git
a/fdroidserver/vmtools.py
b/fdroidserver/vmtools.py
index 97e1c52ce6b20a9d8558fb1393f3d1d54307ae04..aae46c75cc8cfe44a093529a84d655c5e8163b60 100644
(file)
--- a/
fdroidserver/vmtools.py
+++ b/
fdroidserver/vmtools.py
@@
-146,7
+146,7
@@
def get_build_vm(srvdir, provider=None):
has_libvirt_machine = isdir(joinpath(abssrvdir, '.vagrant',
'machines', 'default', 'libvirt'))
has_vbox_machine = isdir(joinpath(abssrvdir, '.vagrant',
- 'machines', 'default', '
libvirt
'))
+ 'machines', 'default', '
virtualbox
'))
if has_libvirt_machine and has_vbox_machine:
logger.info('build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\'')
return VirtualboxBuildVm(abssrvdir)