afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updates to support emane 1.2.1

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-16 09:33:43 -07:00
parent 188f9420ca
commit cd7fd43978
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
daemon/core/emane/nodes.py
View file

@ -14,19 +14,18 @@ from core.enumerations import NodeTypes
from core.enumerations import RegisterTlvs
try:
from emanesh.events import LocationEvent
from emane.events import LocationEvent
except ImportError:
logger.error("error loading emanesh")
try:
from emanesh.events import LocationEvent
except ImportError:
logger.info("emane 0.9.1+ not found")
try:
import emaneeventservice
import emaneeventlocation
except ImportError:
"""
Don't require all CORE users to have EMANE libeventservice and its
Python bindings installed.
"""
logger.error("error loading emaneeventservice and emaneeventlocation")
logger.info("emane < 0.9.1 not found")
class EmaneNet(PyCoreNet):