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

Fix $(dirname) for roslaunch-check.#1624

Merged
dirk-thomas merged 1 commit intoros:melodic-develfrom
clearpathrobotics:fix-dirname-roslaunch-check
Mar 29, 2019
Merged

Fix $(dirname) for roslaunch-check.#1624
dirk-thomas merged 1 commit intoros:melodic-develfrom
clearpathrobotics:fix-dirname-roslaunch-check

Conversation

@mikepurvis
Copy link
Copy Markdown
Member

@mikepurvis mikepurvis commented Feb 20, 2019

Small fix for using $(dirname) in launch files covered by the roslaunch-check tests. Currently you get the test failing with a traceback like this:

Traceback (most recent call last):
  File "<ws>/share/roslaunch/scripts/roslaunch-check", line 90, in <module>
    error_msg = check_roslaunch_file(roslaunch_path, use_test_depends=options.test_depends)
  File "<ws>/share/roslaunch/scripts/roslaunch-check", line 47, in check_roslaunch_file
    error_msg = roslaunch.rlutil.check_roslaunch(roslaunch_file, use_test_depends=use_test_depends)
  File "<ws>/lib/python2.7/dist-packages/roslaunch/rlutil.py", line 201, in check_roslaunch
    base_pkg, file_deps, missing = roslaunch.depends.roslaunch_deps([f], use_test_depends=use_test_depends)
  File "<ws>/lib/python2.7/dist-packages/roslaunch/depends.py", line 332, in roslaunch_deps
    rl_file_deps(file_deps, launch_file, verbose)
  File "<ws>/lib/python2.7/dist-packages/roslaunch/depends.py", line 226, in rl_file_deps
    parse_launch(launch_file, file_deps, verbose)
  File "<ws>/lib/python2.7/dist-packages/roslaunch/depends.py", line 211, in parse_launch
    _parse_launch(launch_tag.childNodes, launch_file, file_deps, verbose, context)
  File "<ws>/lib/python2.7/dist-packages/roslaunch/depends.py", line 141, in _parse_launch
    sub_launch_file = resolve_args(tag.attributes['file'].value, context)
  File "<ws>/lib/python2.7/dist-packages/roslaunch/substitution_args.py", line 389, in resolve_args
    resolved = _resolve_args(arg_str, context, resolve_anon, commands)
  File "<ws>/lib/python2.7/dist-packages/roslaunch/substitution_args.py", line 407, in _resolve_args
    resolved = commands[command](resolved, a, args, context)
  File "<ws>/lib/python2.7/dist-packages/roslaunch/substitution_args.py", line 136, in _dirname
    return resolved.replace("$(%s)" % a, _eval_dirname(context.get('filename', None)))
  File "<ws>/lib/python2.7/dist-packages/roslaunch/substitution_args.py", line 125, in _eval_dirname
    raise SubstitutionException("Cannot substitute $(dirname), no file/directory information available.")
roslaunch.substitution_args.SubstitutionException: Cannot substitute $(dirname), no file/directory information available.

The file/directory information it's referring to comes in via xmlloader, here:

ros_comm/tools/roslaunch/src/roslaunch/xmlloader.py

Lines 181 to 191 in acd8313

def resolve_args(self, args, context):
"""
Wrapper around substitution_args.resolve_args to set common parameters
"""
# resolve_args gets called a lot, so we optimize by testing for dollar sign before resolving
if args and '$' in args:
# Populate resolve_dict with name of the current file being processed.
context.resolve_dict['filename'] = context.filename
return substitution_args.resolve_args(args, context=context.resolve_dict, resolve_anon=self.resolve_anon)
else:
return args

However, roslaunch-check bypasses this logic so the context value never gets set. This change corrects that.

@dirk-thomas
Copy link
Copy Markdown
Member

dirk-thomas commented Mar 29, 2019

Thanks for the patch.

@dirk-thomas dirk-thomas merged commit c8e63ee into ros:melodic-devel Mar 29, 2019
@mikepurvis mikepurvis deleted the fix-dirname-roslaunch-check branch April 2, 2019 18:46
tahsinkose pushed a commit to tahsinkose/ros_comm that referenced this pull request Apr 15, 2019
@mikepurvis @tahsinkose
Fix $(dirname) for roslaunch-check. (ros#1624)
75db7fd
@dirk-thomas dirk-thomas mentioned this pull request Aug 4, 2020
Merged
dirk-thomas pushed a commit that referenced this pull request Aug 4, 2020
@mikepurvis @dirk-thomas
Fix $(dirname) for roslaunch-check. (#1624)
6625217
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mikepurvis @dirk-thomas