File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -245,7 +245,10 @@ def get_ros1_messages(rospack=None):
245
245
pkgs = sorted (x for x in rosmsg .iterate_packages (rospack , rosmsg .MODE_MSG ))
246
246
for package_name , path in pkgs :
247
247
for message_name in rosmsg ._list_types (path , 'msg' , rosmsg .MODE_MSG ):
248
- msgs .append (Message (package_name , message_name , path ))
248
+ # iterate_packages might return ROS2 paths for already found ROS1 pkgs
249
+ msg = Message (package_name , message_name , path )
250
+ if msg not in msgs :
251
+ msgs .append (msg )
249
252
return msgs
250
253
251
254
@@ -626,14 +629,15 @@ def determine_common_services(
626
629
'cpptype' : ros2_type .rstrip ('[]' ).replace ('/' , '::msg::' )
627
630
}
628
631
})
629
- if match :
630
- services .append ({
632
+ service_data = {
631
633
'ros1_name' : pair [0 ].message_name ,
632
634
'ros2_name' : pair [1 ].message_name ,
633
635
'ros1_package' : pair [0 ].package_name ,
634
636
'ros2_package' : pair [1 ].package_name ,
635
637
'fields' : output
636
- })
638
+ }
639
+ if match and service_data not in services :
640
+ services .append (service_data )
637
641
return services
638
642
639
643
You can’t perform that action at this time.
0 commit comments