Skip to content

Commit

Permalink
yocto_recipe.py: Fix setting sensible default for <build_type> when n…
Browse files Browse the repository at this point in the history
…ot ROS 1 (#267)

* get_ros_version expects just a string (as in distro.name) not whole RosDistro class
  This is a bit confusing, because in many places we use the same distro variable
  as this string, rename it to make it more clear in the next commit.
  • Loading branch information
shr-project committed Dec 3, 2020
1 parent a0bf94c commit d30b889
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion superflore/generators/bitbake/yocto_recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ def __init__(
self.license = None
self.homepage = None
self.build_type = 'catkin' if \
yoctoRecipe._get_ros_version(distro) == 1 else 'ament_cmake'
yoctoRecipe._get_ros_version(distro.name) == 1 \
else 'ament_cmake'
self.maintainer = "OSRF"
self.depends = set()
self.depends_external = set()
Expand Down

0 comments on commit d30b889

Please sign in to comment.