aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest: tidy setting of PYTHONPATH in the environment

Browse Source 
This could go badly for others appending to PYTHONPATH - this would have
left a trailing : on the end of the path
This commit is contained in:
Peter Barker 2020-03-03 19:38:24 +11:00 committed by Peter Barker
parent 7828274c72
commit 566732a2d7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/autotest/sim_vehicle.py
View File

@ -720,12 +720,15 @@ def start_mavproxy(opts, stuff):
if len(extra_cmd):
cmd.extend(['--cmd', extra_cmd])
# add Tools/mavproxy_modules to PYTHONPATH in autotest so we can
# find random MAVProxy helper modules like sitl_calibration
local_mp_modules_dir = os.path.abspath(
os.path.join(__file__, '..', '..', 'mavproxy_modules'))
env = dict(os.environ)
env['PYTHONPATH'] = (local_mp_modules_dir +
os.pathsep +
env.get('PYTHONPATH', ''))
old = env.get('PYTHONPATH', None)
env['PYTHONPATH'] = local_mp_modules_dir
if old is not None:
env['PYTHONPATH'] += os.path.sep + old
run_cmd_blocking("Run MavProxy", cmd, env=env)
progress("MAVProxy exited")