Move to ws folder for rosdep command, fixes #876 #878
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Executing the rosdep command from the root of repository (!= workspace), results in multiple packages found with the same name when run from the CI on GitLab. Unable to reproduce this from inside the same container as the CI runs, but this fix seems to circumvent the issue by restricting the folders rosdep can search in. Functionally this should behave the same.
| @@ -373,7 +373,7 @@ function ici_install_dependencies { | |||
| rosdep_opts+=(--skip-keys "$skip_keys") | |||
| fi | |||
|
|
|||
| ROS_PACKAGE_PATH="$cmake_prefix_path${ROS_PACKAGE_PATH:-}" ici_cmd ici_quiet ici_filter "(executing command)|(Setting up)" ici_exec_in_workspace "$extend" "." rosdep install "${rosdep_opts[@]}" | |||
| ROS_PACKAGE_PATH="$cmake_prefix_path${ROS_PACKAGE_PATH:-}" ici_cmd ici_quiet ici_filter "(executing command)|(Setting up)" ici_exec_in_workspace "$extend" "$@" rosdep install "${rosdep_opts[@]}" | |||
There was a problem hiding this comment.
This will only work, if only one argument is passed.
I am not sure, why this fixes the issue.
This just changes the execution directory and not the discovery of packages.
There was a problem hiding this comment.
Suggested change
| ROS_PACKAGE_PATH="$cmake_prefix_path${ROS_PACKAGE_PATH:-}" ici_cmd ici_quiet ici_filter "(executing command)|(Setting up)" ici_exec_in_workspace "$extend" "$@" rosdep install "${rosdep_opts[@]}" | |
| ROS_PACKAGE_PATH="$cmake_prefix_path${ROS_PACKAGE_PATH:-}" ici_cmd ici_quiet ici_filter "(executing command)|(Setting up)" ici_exec_in_workspace "$extend" "${1:-.}" rosdep install "${rosdep_opts[@]}" |
Should do the trick.
I still have to figure out why rosdep behaves that way
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Executing the
rosdepcommand from the root of the repository results in multiple packages found with the same name when run from the CI on GitLab. (See #876 for more information)I have been unable to find the root cause for this, but this fix seems to circumvent the issue by restricting the folders
rosdepcan search in. I believe functionally this should behave the same.