[catkin] 03/03: Move catkin profile.d to /etc/catkin

[Jochen Sprickerhof]

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

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

commit b256f257af383477fce04cc2fb877cbc15a2cfef
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Jun 11 19:10:37 2015 +0200

    Move catkin profile.d to /etc/catkin
---
 .../0005-Use-profile.d-in-usr-in-_setup_util.py.patch  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 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 fbb5bb6..e442f26 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,26 +3,18 @@ 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 | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ cmake/templates/_setup_util.py.in | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/cmake/templates/_setup_util.py.in b/cmake/templates/_setup_util.py.in
-index 47721ad..06c1693 100755
+index 47721ad..325f0b4 100755
 --- a/cmake/templates/_setup_util.py.in
 +++ b/cmake/templates/_setup_util.py.in
-@@ -211,6 +211,15 @@ def find_env_hooks(environ, cmake_prefix_path):
+@@ -211,6 +211,7 @@ def find_env_hooks(environ, cmake_prefix_path):
      specific_env_hook_ext = environ['CATKIN_SHELL'] if not IS_WINDOWS and 'CATKIN_SHELL' in environ and environ['CATKIN_SHELL'] else None
      # remove non-workspace paths
      workspaces = [path for path in cmake_prefix_path.split(os.pathsep) if path and os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))]
-+
-+    workspace = '/usr/share'
-+    env_hook_dir = os.path.join(workspace, 'catkin', 'cmake', 'profile.d')
-+    for filename in sorted(os.listdir(env_hook_dir)):
-+        # append env hook
-+        generic_env_hooks.append(os.path.join(env_hook_dir, filename))
-+        generic_env_hooks_workspace.append(workspace)
-+        generic_env_hooks_by_filename[filename] = generic_env_hooks[-1]
-+
++    workspaces.append('/')
      for workspace in reversed(workspaces):
          env_hook_dir = os.path.join(workspace, 'etc', 'catkin', 'profile.d')
          if os.path.isdir(env_hook_dir):

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