Skip to content

Commit e64f39a

Browse files
committed
Use node_description and ros_executable instead of node_action.
Distro A, OPSEC #4584. You may have additional rights; please see https://rosmilitary.org/faq/?category=ros-2-license Signed-off-by: matthew.lanting <[email protected]>
1 parent f4493a5 commit e64f39a

File tree

1 file changed

+5
-3
lines changed
  • launch_ros/launch_ros/descriptions

1 file changed

+5
-3
lines changed

launch_ros/launch_ros/descriptions/node.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,15 @@ def _get_parameter_rule(self, param: 'Parameter', context: LaunchContext):
267267
return f'{self.__expanded_node_name}:{name}:={yaml.dump(value)}'
268268

269269
def prepare(self, context: LaunchContext, executable: Executable, action: Action) -> None:
270-
self._perform_substitutions(context, executable.cmd, action)
270+
self._perform_substitutions(context, executable)
271271

272272
# Prepare any traits which may be defined for this node
273273
if self.__traits is not None:
274274
for trait in self.__traits:
275275
trait.prepare(self, context, action)
276276

277-
def _perform_substitutions(self, context: LaunchContext, cmd: List, action: Action) -> None:
277+
def _perform_substitutions(self, context: LaunchContext, executable: Executable) -> None:
278+
cmd = executable.cmd
278279
try:
279280
if self.__substitutions_performed:
280281
# This function may have already been called by a subclass' `execute`, for example.
@@ -386,7 +387,8 @@ def _perform_substitutions(self, context: LaunchContext, cmd: List, action: Acti
386387
cmd_extension, ros_specific_arguments = extension.prepare_for_execute(
387388
context,
388389
ros_specific_arguments,
389-
action
390+
executable,
391+
self
390392
)
391393
cmd.extend(cmd_extension)
392394
context.extend_locals({'ros_specific_arguments': ros_specific_arguments})

0 commit comments

Comments
 (0)