[ros-catkin] 01/01: Update profile patch

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

commit 2a734c220f5413e24828cffbb1b62d4cec06ca72
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 16 18:07:10 2015 +0100

    Update profile patch
    
    The profile scripts add the default workspace (/usr in our case) if the
    _WORKSPACE variable is empty. So setting it to empty here to fix the
    generated paths.
---
 .../0005-Use-profile.d-in-usr-in-_setup_util.py.patch     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch b/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch
index e442f26..b7ec07e 100644
--- a/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch
+++ b/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Jun 2015 15:29:55 +0200
 Subject: Use profile.d in /usr in _setup_util.py
 
 ---
- cmake/templates/_setup_util.py.in | 1 +
- 1 file changed, 1 insertion(+)
+ cmake/templates/_setup_util.py.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/cmake/templates/_setup_util.py.in b/cmake/templates/_setup_util.py.in
-index 47721ad..325f0b4 100755
+index 47721ad..6a29452 100755
 --- a/cmake/templates/_setup_util.py.in
 +++ b/cmake/templates/_setup_util.py.in
 @@ -211,6 +211,7 @@ def find_env_hooks(environ, cmake_prefix_path):
@@ -18,3 +18,12 @@ index 47721ad..325f0b4 100755
      for workspace in reversed(workspaces):
          env_hook_dir = os.path.join(workspace, 'etc', 'catkin', 'profile.d')
          if os.path.isdir(env_hook_dir):
+@@ -241,7 +242,7 @@ def find_env_hooks(environ, cmake_prefix_path):
+     lines.append(assignment('_CATKIN_ENVIRONMENT_HOOKS_COUNT', count))
+     for i in range(count):
+         lines.append(assignment('_CATKIN_ENVIRONMENT_HOOKS_%d' % i, env_hooks[i]))
+-        lines.append(assignment('_CATKIN_ENVIRONMENT_HOOKS_%d_WORKSPACE' % i, env_hooks_workspace[i]))
++        lines.append(assignment('_CATKIN_ENVIRONMENT_HOOKS_%d_WORKSPACE' % i, (env_hooks_workspace[i] if env_hooks_workspace[i] != '/' else '')))
+     return lines
+ 
+ 

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