Author: dthomas
Date: 2012-04-27 09:16:28 -0700 (Fri, 27 Apr 2012)
New Revision: 16672
Modified:
stacks/ros_comm/trunk/tools/rosmsg/src/rosmsg/__init__.py
stacks/ros_comm/trunk/tools/rosnode/src/rosnode/__init__.py
stacks/ros_comm/trunk/tools/rosservice/src/rosservice/__init__.py
stacks/ros_comm/trunk/tools/rostopic/src/rostopic/__init__.py
Log:
fixed usage of unix-only attribute (fixed #3939)
Modified: stacks/ros_comm/trunk/tools/rosmsg/src/rosmsg/__init__.py
===================================================================
--- stacks/ros_comm/trunk/tools/rosmsg/src/rosmsg/__init__.py 2012-04-27 16:15:28 UTC (rev 16671)
+++ stacks/ros_comm/trunk/tools/rosmsg/src/rosmsg/__init__.py 2012-04-27 16:16:28 UTC (rev 16672)
@@ -334,15 +334,15 @@
except KeyError as e:
if not options.silent:
sys.stderr.write("Unknown message type: %s"%e, file=sys.stderr)
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
# except rospkg.InvalidROSPkgException as e:
# if not options.silent:
# print(file=sys.stderr, "Invalid package: '%s'"%e)
- # sys.exit(os.EX_USAGE)
+ # sys.exit(getattr(os, 'EX_USAGE', 1))
except ValueError, e:
if not options.silent:
sys.stderr.write("Invalid type: '%s'"%e)
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
except RosMsgProtoException as e:
if not options.silent:
sys.stderr.write(str(e))
@@ -350,7 +350,7 @@
except RosMsgProtoArgsException as e:
if not options.silent:
sys.stderr.write("%s"%e)
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
except KeyboardInterrupt:
pass
@@ -722,16 +722,16 @@
sys.exit(0)
else:
print(fullusage('ros'+mode[1:]))
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
except KeyError as e:
print("Unknown message type: %s"%e, file=sys.stderr)
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
except rospkg.ResourceNotFound as e:
print("Invalid package: %s"%e, file=sys.stderr)
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
except ValueError as e:
print("Invalid type: '%s'"%e, file=sys.stderr)
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
except ROSMsgException as e:
print(str(e), file=sys.stderr)
sys.exit(1)
Modified: stacks/ros_comm/trunk/tools/rosnode/src/rosnode/__init__.py
===================================================================
--- stacks/ros_comm/trunk/tools/rosnode/src/rosnode/__init__.py 2012-04-27 16:15:28 UTC (rev 16671)
+++ stacks/ros_comm/trunk/tools/rosnode/src/rosnode/__init__.py 2012-04-27 16:16:28 UTC (rev 16672)
@@ -740,7 +740,7 @@
Type rosnode <command> -h for more detailed usage, e.g. 'rosnode ping -h'
""")
if return_error:
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
else:
sys.exit(0)
Modified: stacks/ros_comm/trunk/tools/rosservice/src/rosservice/__init__.py
===================================================================
--- stacks/ros_comm/trunk/tools/rosservice/src/rosservice/__init__.py 2012-04-27 16:15:28 UTC (rev 16671)
+++ stacks/ros_comm/trunk/tools/rosservice/src/rosservice/__init__.py 2012-04-27 16:16:28 UTC (rev 16672)
@@ -711,7 +711,7 @@
Type rosservice <command> -h for more detailed usage, e.g. 'rosservice call -h'
""")
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
def rosservicemain(argv=sys.argv):
"""
Modified: stacks/ros_comm/trunk/tools/rostopic/src/rostopic/__init__.py
===================================================================
--- stacks/ros_comm/trunk/tools/rostopic/src/rostopic/__init__.py 2012-04-27 16:15:28 UTC (rev 16671)
+++ stacks/ros_comm/trunk/tools/rostopic/src/rostopic/__init__.py 2012-04-27 16:16:28 UTC (rev 16672)
@@ -1619,7 +1619,7 @@
Type rostopic <command> -h for more detailed usage, e.g. 'rostopic echo -h'
""")
- sys.exit(os.EX_USAGE)
+ sys.exit(getattr(os, 'EX_USAGE', 1))
def rostopicmain(argv=None):
import rosbag
_______________________________________________
Ros-commits mailing list
Ros-commits@code.ros.org
https://code.ros.org/mailman/listinfo/ros-commits
(text/plain)
