Skip to content

Commit 263c53e

Browse files
committed
support variable length list for indexing message packages.
1 parent 5f5ae8d commit 263c53e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/rosjava_build_tools/catkin.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ def has_build_depend_on_message_generation(package):
2727
return 'message_generation' in [d.name for d in package.build_depends]
2828

2929

30-
def index_message_package_dependencies_from_local_environment(package_name=None, package_paths=None):
30+
def index_message_package_dependencies_from_local_environment(package_name_list=[], package_paths=None):
3131
'''
3232
Returns a topologically sorted list of message packages that can
3333
be used for sequencing builds of packages.
3434
35-
@param package_name : sort dependencies for this package only (defaults to all packages if None is given)
35+
@param package_name_list : sort dependencies for these packages only (defaults to all if empty)
3636
@param package_paths : a python list of ros workspaces (defaults to ROS_PACKAGE_PATH if None is given)
3737
@return dict mapping relative path to a catkin_pkg.Package
3838
'''
@@ -47,8 +47,8 @@ def index_message_package_dependencies_from_local_environment(package_name=None,
4747
for package_path, package in catkin_pkg.packages.find_packages(path).items():
4848
all_packages[package.name] = (package_path, package)
4949
if has_build_depend_on_message_generation(package):
50-
if package_name is not None:
51-
if package_name == package.name:
50+
if package_name_list:
51+
if package.name in package_name_list:
5252
message_packages[package.name] = (package_path, package)
5353
else:
5454
message_packages[package.name] = (package_path, package)

0 commit comments

Comments
 (0)