From ros-commits-bounces@code.ros.org  Fri Apr 27 09:16:30 2012
Return-Path: <ros-commits-bounces@code.ros.org>
X-Original-To: www-data@code.ros.org
Delivered-To: www-data@code.ros.org
Received: from pub5.willowgarage.com (localhost [127.0.0.1])
	by pub5.willowgarage.com (Postfix) with ESMTP id 2A4EE25C1D8
	for <www-data@code.ros.org>; Fri, 27 Apr 2012 09:16:30 -0700 (PDT)
X-Original-To: ros-commits@code.ros.org
Delivered-To: ros-commits@code.ros.org
Received: by pub5.willowgarage.com (Postfix, from userid 33)
	id CE3EA25C1E9; Fri, 27 Apr 2012 09:16:28 -0700 (PDT)
To: ros-commits@code.ros.org
From: dthomas@code.ros.org
Message-Id: <20120427161628.CE3EA25C1E9@pub5.willowgarage.com>
Date: Fri, 27 Apr 2012 09:16:28 -0700 (PDT)
Subject: [Ros-commits] r16672 - in stacks/ros_comm/trunk/tools:
	rosmsg/src/rosmsg rosnode/src/rosnode
	rosservice/src/rosservice rostopic/src/rostopic
X-BeenThere: ros-commits@code.ros.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: SVN commit messages <ros-commits.code.ros.org>
List-Unsubscribe: <https://code.ros.org/mailman/options/ros-commits>,
	<mailto:ros-commits-request@code.ros.org?subject=unsubscribe>
List-Archive: </lurker/list/ros-commits.html>
List-Post: <mailto:ros-commits@code.ros.org>
List-Help: <mailto:ros-commits-request@code.ros.org?subject=help>
List-Subscribe: <https://code.ros.org/mailman/listinfo/ros-commits>,
	<mailto:ros-commits-request@code.ros.org?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ros-commits-bounces@code.ros.org
Errors-To: ros-commits-bounces@code.ros.org

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