Merge pull request #111 from mikepurvis/avoid-stacks

Avoid putting the rosbuild stacks dir on RPP if it doesn't exist.
2016-08-05 10:19:55 -07:00 · 2016-08-05 10:19:55 -07:00 · 0b34080563
parent 8533286a9c 6b88eb6a52
commit 0b34080563
1 changed files with 2 additions and 1 deletions
--- a/core/roslib/env-hooks/10.ros.sh.em
+++ b/core/roslib/env-hooks/10.ros.sh.em
@ -23,7 +23,8 @@ for workspace in workspaces:
        data = f.read()
    if data == '':
        paths.append(os.path.join(workspace, 'share'))
-        paths.append(os.path.join(workspace, 'stacks'))
+        if os.path.isdir(os.path.join(workspace, 'stacks')):
+            paths.append(os.path.join(workspace, 'stacks'))
    else:
        for source_path in data.split(';'):
            paths.append(source_path)