[ros-rosinstall] 01/01: Add patch for rosbuild

[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-rosinstall.

commit 15897905c928cbd5bd4b19afc03c710fcf86f00d
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 16 23:36:37 2015 +0100

    Add patch for rosbuild
---
 .../0001-Add-default-ROS_ROOT-for-rosbuild.patch   | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/0001-Add-default-ROS_ROOT-for-rosbuild.patch b/debian/patches/0001-Add-default-ROS_ROOT-for-rosbuild.patch
new file mode 100644
index 0000000..2cc897e
--- /dev/null
+++ b/debian/patches/0001-Add-default-ROS_ROOT-for-rosbuild.patch
@@ -0,0 +1,23 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Mon, 16 Nov 2015 23:36:04 +0100
+Subject: Add default ROS_ROOT for rosbuild
+
+---
+ src/rosinstall/setupfiles.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/rosinstall/setupfiles.py b/src/rosinstall/setupfiles.py
+index 6df09cb..c46d9af 100644
+--- a/src/rosinstall/setupfiles.py
++++ b/src/rosinstall/setupfiles.py
+@@ -290,6 +290,10 @@ EOPYTHON`
+ unset _ROS_ROOT_ROSINSTALL
+ fi
+ 
++if [ -z "${ROS_ROOT}" ]; then
++    export ROS_ROOT=/usr/share/ros
++fi
++
+ if [ ! -z "$_SETUP_SH_ERROR" ]; then
+   # return failure code when sourcing file
+   false
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..18341e8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-default-ROS_ROOT-for-rosbuild.patch

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