Skip to content

Commit

Permalink
[melodic]: Switch dependency back to python-rosdep.
Browse files Browse the repository at this point in the history
Prior to #109 , installing
ros-melodic-desktop on Melodic installed the `rosdep` command-line.
After that change, it no longer does.  For backwards compatibility
reasons, revert that change just for melodic.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
  • Loading branch information
clalancette committed Mar 25, 2020
1 parent cb4c93a commit 5696164
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@

<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-pkg-modules</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg-modules</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rosdep-modules</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rosdep-modules</exec_depend>
<!-- This package really only depends on python-rosdep-modules, but in order
to keep installing the rosdep command-line tool in Melodic we depend on
python-rosdep.
-->
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rosdep</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rosdep</exec_depend>
<exec_depend>ros_environment</exec_depend>

<test_depend condition="$ROS_PYTHON_VERSION == 2">python-coverage</test_depend>
Expand Down

0 comments on commit 5696164

Please sign in to comment.