Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding updates for python3 compatibility and new virtualbox SDK versi… #47167

Merged
merged 2 commits into from Apr 23, 2018
Merged

Adding updates for python3 compatibility and new virtualbox SDK versi… #47167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91252ba
Adding updates for python3 compatibility and new virtualbox SDK versi…
smitty42 Apr 18, 2018
5de5313
Merge branch '2017.7' into vbox-skd-fix
smitty42 Apr 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion salt/utils/virtualbox.py
View file
Open in desktop
Expand Up @@ -132,6 +132,12 @@ def vb_get_manager():
'''
global _virtualboxManager
if _virtualboxManager is None and HAS_LIBS:
try:
from importlib import reload
except ImportError:
# If we get here, we are in py2 and reload is a built-in.
pass

# Reloading the API extends sys.paths for subprocesses of multiprocessing, since they seem to share contexts
reload(vboxapi)
_virtualboxManager = vboxapi.VirtualBoxManager(None, None)
Expand All @@ -146,7 +152,13 @@ def vb_get_box():
@rtype: IVirtualBox
'''
vb_get_manager()
vbox = _virtualboxManager.vbox

try:
# This works in older versions of the SDK, but does not seem to work anymore.
vbox = _virtualboxManager.vbox
except AttributeError:
vbox = _virtualboxManager.getVirtualBox()

return vbox


Expand Down