Catkin_make fails with "ImportError: cannot import name ensure_workspace_marker"
Under ROS hydro, catkin_make has been working fine for me. However, now when I change to my local workspace and execute catkin_make, I get the following error:
~/catkin_ws $ catkin_make
Traceback (most recent call last):
File "/opt/ros/hydro/bin/catkin_make", line 15, in <module>
from catkin.builder import cmake_input_changed
File "/opt/ros/hydro/lib/python2.7/dist-packages/catkin/builder.py", line 61, in <module>
from catkin_pkg.workspaces import ensure_workspace_marker
ImportError: cannot import name ensure_workspace_marker
A few days ago there was a massive upgrade of packages for ROS hydro which I installed, but I'm not sure if that is related or not.
What might have broken with my ROS installation that is causing this error?
Any help would be appreciated. Thanks.