Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some errors in some probably not frequented code paths melodic #1415

Merged
merged 1 commit into from
Jun 6, 2018
Merged

Fix some errors in some probably not frequented code paths melodic #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clients/rospy/src/rospy/impl/tcpros_pubsub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def create_transport(self, resolved_name, pub_uri, protocol_params):
if type(protocol_params) != list or len(protocol_params) != 3:
return 0, "ERROR: invalid TCPROS parameters", 0
if protocol_params[0] != TCPROS:
return 0, "INTERNAL ERROR: protocol id is not TCPROS: %s"%id, 0
return 0, "INTERNAL ERROR: protocol id is not TCPROS: %s"%protocol_params[0], 0
id, dest_addr, dest_port = protocol_params

sub = rospy.impl.registration.get_topic_manager().get_subscriber_impl(resolved_name)
Expand Down
2 changes: 1 addition & 1 deletion clients/rospy/src/rospy/names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
is_global, is_private
import rosgraph.names

from rospy.exceptions import ROSException
from rospy.exceptions import ROSException, ROSInitException
from rospy.impl.validators import ParameterInvalid

TOPIC_ANYTYPE = ANYTYPE #indicates that a subscriber will connect any datatype given to it
Expand Down