ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-12 20:38:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle
2016-08-29 14:07:52 +02:00
parent b7bf97039c da1cd9a3e7
commit 72fe5d3489
14 changed files with 314 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/compute/base_node.py
View File

@ -452,11 +452,7 @@ class BaseNode:
"""
path = self._manager.config.get_section_config("Server").get("ubridge_path", "ubridge")
if path == "ubridge" or path == "None":
path = shutil.which("ubridge")
if path is None or len(path) == 0:
raise NodeError("uBridge is not installed")
path = shutil.which(path)
return path
@asyncio.coroutine
@ -481,7 +477,7 @@ class BaseNode:
"""
if self.ubridge_path is None:
raise NodeError("uBridge is not available")
raise NodeError("uBridge is not available or path doesn't exist")
if not self._manager.has_privileged_access(self.ubridge_path):
raise NodeError("uBridge requires root access or capability to interact with network adapters")