Skip to content

Commit

Permalink
warn about removing target repo
Browse files Browse the repository at this point in the history
  • Loading branch information
mathias-luedtke committed Mar 9, 2017
1 parent 2f2381d commit c7a1529
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .travis.rosinstall
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
- git:
uri: https://github.com/ros/std_msgs.git
local-name: ros/std_msgs
- git:
uri: https://github.com/ros-industrial/industrial_ci.git
local-name: industrial_ci
3 changes: 2 additions & 1 deletion industrial_ci/src/tests/source_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ esac
# download upstream packages into workspace
if [ -e $CATKIN_WORKSPACE/src/.rosinstall ]; then
# ensure that the target is not in .rosinstall
(cd $CATKIN_WORKSPACE/src; $ROSWS rm $TARGET_REPO_NAME 2> /dev/null || true)
(cd $CATKIN_WORKSPACE/src; $ROSWS rm $TARGET_REPO_NAME 2> /dev/null \
&& echo "$ROSWS ignored $TARGET_REPO_NAME found in $CATKIN_WORKSPACE/src/.rosinstall file. Its source fetched from your repository is used instead." || true) # TODO: add warn function
$ROSWS update -t $CATKIN_WORKSPACE/src
fi
# TARGET_REPO_PATH is the path of the downstream repository that we are testing. Link it to the catkin workspace
Expand Down

0 comments on commit c7a1529

Please sign in to comment.