Skip to content
This repository was archived by the owner on May 31, 2025. It is now read-only.

Added missing arg to check_roslaunch_dir() definition#890

Merged
dirk-thomas merged 2 commits intoros:kinetic-develfrom
clearpathrobotics:add-missing-test-depend-arg
Sep 7, 2016
Merged

Added missing arg to check_roslaunch_dir() definition#890
dirk-thomas merged 2 commits intoros:kinetic-develfrom
clearpathrobotics:add-missing-test-depend-arg

Conversation

@jliviero
Copy link
Copy Markdown
Contributor

@jliviero jliviero commented Sep 7, 2016

rosrun roslaunch roslaunch-check /path/to/file fails on kinetic-devel with the following output:

Traceback (most recent call last):
  File "/home/jliviero/ws/src/ros_comm/tools/roslaunch/scripts/roslaunch-check", line 93, in <module>
    error_msg = check_roslaunch_dir(roslaunch_path, use_test_depends=options.test_depends)
TypeError: check_roslaunch_dir() got an unexpected keyword argument 'use_test_depends'

It seems the new arg was added to the call, but not the method definition, in this diff.

@dirk-thomas
Copy link
Copy Markdown
Member

Good catch. Can you please update the diff to only contain the changes compared to the kinetic-devel branch. Currently it seems to include many changes which have already been merged.

@jliviero
Copy link
Copy Markdown
Contributor Author

jliviero commented Sep 7, 2016

Currently it seems to include many changes which have already been merged.

Just noticed that as well; will do.

return "[%s]:\n\t%s"%(roslaunch_file,error_msg)

def check_roslaunch_dir(roslaunch_dir):
def check_roslaunch_dir(roslaunch_dir, use_test_depends=False):
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The parameter also needs to be passed to the check_roslaunch_file call in line 57.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, good catch.

@jliviero jliviero force-pushed the add-missing-test-depend-arg branch from 364c363 to 44364bf Compare September 7, 2016 16:57
@dirk-thomas
Copy link
Copy Markdown
Member

Thank you for the patch.

For the record this fixes a regression of #887. @k-okada FYI

@dirk-thomas dirk-thomas merged commit 0d71a99 into ros:kinetic-devel Sep 7, 2016
rsinnet pushed a commit to MisoRobotics/ros_comm that referenced this pull request Jun 19, 2017
* Added missing arg to check_roslaunch_dir() definition

* Added use_test_depends arg to check_roslaunch_file() call
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants