p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #165 from ros/merge_lunar_into_kinetic 

merge differences from lunar-devel branch into kinetic-devel
This commit is contained in:
Dirk Thomas 2018-01-26 10:56:14 -08:00 committed by GitHub
parent 9a509a6531 91961447c9
commit c9962f684d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -11,4 +11,4 @@ Installation Notes
For full installation instructions, including system prerequisites and
platform-specific help, see:
http://ros.org/wiki/ROS/Installation
http://wiki.ros.org/ROS/Installation

7
tools/rosunit/src/rosunit/baretest.py
View File

@ -39,6 +39,7 @@ executables. These do not run in a ROS environment.
from __future__ import print_function
import errno
import os
try:
from cStringIO import StringIO
@ -256,7 +257,7 @@ class LocalProcess(pmon.Process):
try:
os.makedirs(log_dir)
except OSError as e:
if e.errno == 13:
if e.errno == errno.EACCES:
raise RLException("unable to create directory for log file [%s].\nPlease check permissions."%log_dir)
else:
raise RLException("unable to create directory for log file [%s]: %s"%(log_dir, e.strerror))
@ -331,9 +332,9 @@ class LocalProcess(pmon.Process):
self.popen = subprocess.Popen(self.args, cwd=cwd, stdout=logfileout, stderr=logfileerr, env=full_env, close_fds=True, preexec_fn=os.setsid)
except OSError as e:
self.started = True # must set so is_alive state is correct
if e.errno == 8: #Exec format error
if e.errno == errno.ENOEXEC: #Exec format error
raise pmon.FatalProcessLaunch("Unable to launch [%s]. \nIf it is a script, you may be missing a '#!' declaration at the top."%self.name)
elif e.errno == 2: #no such file or directory
elif e.errno == errno.ENOENT: #no such file or directory
raise pmon.FatalProcessLaunch("""Roslaunch got a '%s' error while attempting to run:
%s