kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-02 09:10:11 +02:00
Code Activity

Merge branch 'fix_class' into 'master'

Browse Source 
vmtools: Properly initialize provider member

See merge request fdroid/fdroidserver!1329
This commit is contained in:
Hans-Christoph Steiner 2023-03-21 14:02:21 +00:00
commit 4165c32e2f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdroidserver/vmtools.py
View File

@ -197,9 +197,9 @@ class FDroidBuildVm:
wrapper around the vagrant functions we use.
"""
def __init__(self, srvdir):
def __init__(self, srvdir, provider=None):
"""Create new server class."""
self.provider = None
self.provider = provider
self.srvdir = srvdir
self.srvname = basename(srvdir) + '_default'
self.vgrntfile = os.path.join(srvdir, 'Vagrantfile')
@ -377,8 +377,7 @@ class FDroidBuildVm:
class LibvirtBuildVm(FDroidBuildVm):
def __init__(self, srvdir):
self.provider = 'libvirt'
super().__init__(srvdir)
super().__init__(srvdir, 'libvirt')
import libvirt
try:
@ -428,5 +427,4 @@ class LibvirtBuildVm(FDroidBuildVm):
class VirtualboxBuildVm(FDroidBuildVm):
def __init__(self, srvdir):
self.provider = 'virtualbox'
super().__init__(srvdir)
super().__init__(srvdir, 'virtualbox')