Skip to content
This repository was archived by the owner on Jan 14, 2023. It is now read-only.

Commit ff483f3

Browse files
committed
use the catkin.message_package_whitelist for broken message packages.
1 parent c39ea4f commit ff483f3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/genjava/gradle_project.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import subprocess
1212
from catkin_pkg.packages import find_packages
1313
import rospkg
14+
import rosjava_build_tools.catkin
1415

1516
##############################################################################
1617
# Utils
@@ -118,10 +119,12 @@ def create_msg_package_index():
118119
package_index = {}
119120
ros_paths = rospkg.get_ros_package_path()
120121
ros_paths = [x for x in ros_paths.split(':') if x]
122+
# packages that don't properly identify themselves as message packages (fix upstream).
121123
for path in reversed(ros_paths): # make sure we pick up the source overlays last
122124
for unused_package_path, package in find_packages(path).items():
123125
if ('message_generation' in [dep.name for dep in package.build_depends] or
124-
'genmsg' in [dep.name for dep in package.build_depends]):
126+
'genmsg' in [dep.name for dep in package.build_depends] or
127+
package.name in rosjava_build_tools.catkin.message_package_whitelist):
125128
# print(package.name)
126129
# print(" version: %s" % package.version)
127130
# print(" dependencies: ")

0 commit comments

Comments
 (0)