honor CATKIN_IGNORE marker file when crawling for packages (fix #21)

ros · Jul 5, 2013 · 6f2d93b · 6f2d93b
1 parent 82d83d1
commit 6f2d93b
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/rospack.cpp b/src/rospack.cpp
@@ -93,6 +93,7 @@ static const char* ROSSTACK_MANIFEST_NAME = "stack.xml";
 static const char* ROSPACK_CACHE_NAME = "rospack_cache";
 static const char* ROSSTACK_CACHE_NAME = "rosstack_cache";
 static const char* ROSPACK_NOSUBDIRS = "rospack_nosubdirs";
+static const char* CATKIN_IGNORE = "CATKIN_IGNORE";
 static const char* DOTROS_NAME = ".ros";
 static const char* MSG_GEN_GENERATED_DIR = "msg_gen";
 static const char* MSG_GEN_GENERATED_FILE = "generated";
@@ -1453,6 +1454,17 @@ Rosstackage::crawlDetail(const std::string& path,
  return;
  }
 
+ fs::path catkin_ignore = fs::path(path) / CATKIN_IGNORE;
+ try
+ {
+ if(fs::is_regular_file(catkin_ignore))
+ return;
+ }
+ catch(fs::filesystem_error& e)
+ {
+ logWarn(std::string("error while looking for ") + catkin_ignore.string() + ": " + e.what());
+ }
+
  if(isStackage(path))
  {
  addStackage(path);