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

expose command exceptions within emane and mobility

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-02 15:54:27 -08:00
parent fbc749849c
commit 29a3496eda
3 changed files with 30 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/mobility.py
View file

@ -5,7 +5,6 @@ mobility.py: mobility helpers for moving nodes and calculating wireless range.
import heapq
import math
import os
import subprocess
import threading
import time
@ -1238,8 +1237,5 @@ class Ns2ScriptedMobility(WayPointMobility):
if filename is None or filename == '':
return
filename = self.findfile(filename)
try:
args = ["/bin/sh", filename, typestr]
utils.check_cmd(args, cwd=self.session.sessiondir, env=self.session.get_environment())
except subprocess.CalledProcessError:
logger.exception("Error running script '%s' for WLAN state %s", filename, typestr)
args = ["/bin/sh", filename, typestr]
utils.check_cmd(args, cwd=self.session.sessiondir, env=self.session.get_environment())