Skip to content
Snippets Groups Projects
Commit ff483f32 authored by Daniel Stonier's avatar Daniel Stonier
Browse files

use the catkin.message_package_whitelist for broken message packages.

parent c39ea4fc
Branches
No related tags found
No related merge requests found
...@@ -11,6 +11,7 @@ import shutil ...@@ -11,6 +11,7 @@ import shutil
import subprocess import subprocess
from catkin_pkg.packages import find_packages from catkin_pkg.packages import find_packages
import rospkg import rospkg
import rosjava_build_tools.catkin
############################################################################## ##############################################################################
# Utils # Utils
...@@ -118,10 +119,12 @@ def create_msg_package_index(): ...@@ -118,10 +119,12 @@ def create_msg_package_index():
package_index = {} package_index = {}
ros_paths = rospkg.get_ros_package_path() ros_paths = rospkg.get_ros_package_path()
ros_paths = [x for x in ros_paths.split(':') if x] ros_paths = [x for x in ros_paths.split(':') if x]
# packages that don't properly identify themselves as message packages (fix upstream).
for path in reversed(ros_paths): # make sure we pick up the source overlays last for path in reversed(ros_paths): # make sure we pick up the source overlays last
for unused_package_path, package in find_packages(path).items(): for unused_package_path, package in find_packages(path).items():
if ('message_generation' in [dep.name for dep in package.build_depends] or if ('message_generation' in [dep.name for dep in package.build_depends] or
'genmsg' in [dep.name for dep in package.build_depends]): 'genmsg' in [dep.name for dep in package.build_depends] or
package.name in rosjava_build_tools.catkin.message_package_whitelist):
# print(package.name) # print(package.name)
# print(" version: %s" % package.version) # print(" version: %s" % package.version)
# print(" dependencies: ") # print(" dependencies: ")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment