From e0f0c98ffd75ed57a9e1444c2076251efd6f1ceb Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 13 Aug 2014 12:11:41 -0600 Subject: [PATCH] Do not look for vboxwrapper on non Windows platforms. --- gns3server/modules/virtualbox/__init__.py | 39 ++++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gns3server/modules/virtualbox/__init__.py b/gns3server/modules/virtualbox/__init__.py index d7e0f1f9..2e70d981 100644 --- a/gns3server/modules/virtualbox/__init__.py +++ b/gns3server/modules/virtualbox/__init__.py @@ -60,25 +60,26 @@ class VirtualBox(IModule): def __init__(self, name, *args, **kwargs): - # get the vboxwrapper location - config = Config.instance() - vbox_config = config.get_section_config(name.upper()) - self._vboxwrapper_path = vbox_config.get("vboxwrapper_path") - if not self._vboxwrapper_path or not os.path.isfile(self._vboxwrapper_path): - paths = [os.getcwd()] + os.environ["PATH"].split(":") - # look for iouyap in the current working directory and $PATH - for path in paths: - try: - if "vboxwrapper" in os.listdir(path) and os.access(os.path.join(path, "vboxwrapper"), os.X_OK): - self._vboxwrapper_path = os.path.join(path, "vboxwrapper") - break - except OSError: - continue - - if not self._vboxwrapper_path: - log.warning("vboxwrapper couldn't be found!") - elif not os.access(self._vboxwrapper_path, os.X_OK): - log.warning("vboxwrapper is not executable") + # get the vboxwrapper location (only non-Windows platforms) + if not sys.platform.startswith("win"): + config = Config.instance() + vbox_config = config.get_section_config(name.upper()) + self._vboxwrapper_path = vbox_config.get("vboxwrapper_path") + if not self._vboxwrapper_path or not os.path.isfile(self._vboxwrapper_path): + paths = [os.getcwd()] + os.environ["PATH"].split(":") + # look for iouyap in the current working directory and $PATH + for path in paths: + try: + if "vboxwrapper" in os.listdir(path) and os.access(os.path.join(path, "vboxwrapper"), os.X_OK): + self._vboxwrapper_path = os.path.join(path, "vboxwrapper") + break + except OSError: + continue + + if not self._vboxwrapper_path: + log.warning("vboxwrapper couldn't be found!") + elif not os.access(self._vboxwrapper_path, os.X_OK): + log.warning("vboxwrapper is not executable") # a new process start when calling IModule IModule.__init__(self, name, *args, **kwargs)