Merge pull request #169 from jbohren-forks/fix-context-awareness

build: preventing build --this from looking outside of the workspace

catkin_tools/common.py

@@ -403,7 +403,7 @@ def wide_log(msg, **kwargs):
     wide_log_fn(msg, **kwargs)
 
 
-def find_enclosing_package(search_start_path=None):
+def find_enclosing_package(search_start_path=None, ws_path=None):
     """Get the package containing the current directory."""
 
     search_start_path = search_start_path or os.getcwd()
@@ -418,7 +418,7 @@ def find_enclosing_package(search_start_path=None):
 
         # Update search path or end
         (search_start_path, child_path) = os.path.split(search_start_path)
-        if len(child_path) == 0:
+        if len(child_path) == 0 or search_start_path == ws_path:
             break
 
     return None

catkin_tools/verbs/catkin_build/cli.py

@@ -15,6 +15,7 @@
 from __future__ import print_function
 
 import argparse
+import os
 import sys
 import time
 
@@ -29,6 +30,7 @@
 
 from catkin_tools.context import Context
 
+from catkin_tools.metadata import find_enclosing_workspace
 from catkin_tools.metadata import get_metadata
 from catkin_tools.metadata import update_metadata
 
@@ -187,7 +189,8 @@ def main(opts):
     if opts.build_this or opts.start_with_this:
         # Determine the enclosing package
         try:
-            this_package = find_enclosing_package()
+            ws_path = find_enclosing_workspace(os.getcwd())
+            this_package = find_enclosing_package(search_start_path=os.getcwd(), ws_path=ws_path)
         except (InvalidPackage, RuntimeError):
             this_package = None