[ros-comm] 01/01: Add patch for default ROS_MASTER_URI

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-comm.

commit 9cc616d9076a1e296fbfb9b59d89e2bdb661a259
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Dec 12 09:58:27 2014 +0100

    Add patch for default ROS_MASTER_URI
---
 .../patches/0009-Add-default-ROS_MASTER_URI.patch  | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/0009-Add-default-ROS_MASTER_URI.patch b/debian/patches/0009-Add-default-ROS_MASTER_URI.patch
new file mode 100644
index 0000000..7bf4fa2
--- /dev/null
+++ b/debian/patches/0009-Add-default-ROS_MASTER_URI.patch
@@ -0,0 +1,24 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 12 Dec 2014 09:52:19 +0100
+Subject: Add default ROS_MASTER_URI
+
+---
+ tools/rosgraph/src/rosgraph/rosenv.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tools/rosgraph/src/rosgraph/rosenv.py b/tools/rosgraph/src/rosgraph/rosenv.py
+index 93022f4..c3264d2 100644
+--- a/tools/rosgraph/src/rosgraph/rosenv.py
++++ b/tools/rosgraph/src/rosgraph/rosenv.py
+@@ -69,7 +69,10 @@ def get_master_uri(env=None, argv=None):
+                 if not val:
+                     raise ValueError("__master remapping argument '%s' improperly specified"%arg)
+                 return val
+-        return env[ROS_MASTER_URI]
++        if ROS_MASTER_URI in env:
++            return env[ROS_MASTER_URI]
++        else:
++            return 'http://localhost:11311'
+     except KeyError as e:
+         return None
+         
diff --git a/debian/patches/series b/debian/patches/series
index bd9f2db..2c4bc40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-Add-SONAME-for-roscpp.patch
 0007-Add-SONAME-for-topic_tools.patch
 0008-Add-SONAME-to-rosbag.patch
+0009-Add-default-ROS_MASTER_URI.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-comm.git