Unverified Commit c82eec2e authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #8 from nim65s/devel

PYTHONPATH default to empty string, fix #5
parents 00fc555e 3dacfd28
Pipeline #5793 passed with stage
in 3 minutes and 27 seconds
/*
/*
* Copyright 2016,
*
* Rohan Budhiraja
......@@ -7,7 +7,7 @@
* LAAS, CNRS
*
* This file is part of TALOSController.
* TALOSController is a free software,
* TALOSController is a free software,
*
*/
......@@ -49,8 +49,8 @@ void SoTTalosController::init()
interpreter_ = boost::shared_ptr<dynamicgraph::Interpreter>(
new dynamicgraph::Interpreter (nh));
sotDEBUG(25) << __FILE__ << ":"
<< __FUNCTION__ <<"(#"
sotDEBUG(25) << __FILE__ << ":"
<< __FUNCTION__ <<"(#"
<< __LINE__ << " )" << std::endl;
double ts = ros::param::param<double> ("/sot_controller/dt", SoTTalosDevice::TIMESTEP_DEFAULT);
......@@ -85,7 +85,7 @@ cleanupSetSensors(map<string, dgsot::SensorValues> &SensorsIn)
void SoTTalosController::
getControl(map<string,dgsot::ControlValues> &controlOut)
{
try
try
{
sotDEBUG(25) << __FILE__ << __FUNCTION__ << "(#" << __LINE__ << ")" << endl;
device_->getControl(controlOut);
......@@ -94,10 +94,10 @@ getControl(map<string,dgsot::ControlValues> &controlOut)
catch ( dynamicgraph::sot::ExceptionAbstract & err)
{
std::cout << __FILE__ << " "
<< __FUNCTION__ << " ("
<< __LINE__ << ") "
<< err.getStringMessage()
std::cout << __FILE__ << " "
<< __FUNCTION__ << " ("
<< __LINE__ << ") "
<< err.getStringMessage()
<< endl;
throw err;
}
......@@ -147,7 +147,7 @@ startupPython()
{
std::ofstream aof(LOG_PYTHON.c_str());
runPython (aof, "import sys, os", *interpreter_);
runPython (aof, "pythonpath = os.environ['PYTHONPATH']", *interpreter_);
runPython (aof, "pythonpath = os.environ.get('PYTHONPATH', '')", *interpreter_);
runPython (aof, "path = []", *interpreter_);
runPython (aof,
"for p in pythonpath.split(':'):\n"
......@@ -163,4 +163,3 @@ startupPython()
dynamicgraph::rosInit (true);
aof.close();
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment