From 5b6cf04b6a150bdbe59524d1d6db24d223fb1160 Mon Sep 17 00:00:00 2001
From: Arusekk <arek_koz@o2.pl>
Date: Mon, 10 Feb 2020 23:30:56 +0100
Subject: [PATCH] Do not display error message if poll yields EINTR (#1868)

* Do not display error message if poll yields EINTR

Closes #1370
closes TonyRobotics/RoboWare#63
closes ericsantii/alexa-turtlesim-ros#2

* Keep abstraction compatibility
---
 clients/roscpp/src/libros/poll_set.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/clients/roscpp/src/libros/poll_set.cpp b/clients/roscpp/src/libros/poll_set.cpp
index 50580ee806..065a607b40 100644
--- a/clients/roscpp/src/libros/poll_set.cpp
+++ b/clients/roscpp/src/libros/poll_set.cpp
@@ -191,7 +191,10 @@ void PollSet::update(int poll_timeout)
   boost::shared_ptr<std::vector<socket_pollfd> > ofds = poll_sockets(epfd_, &ufds_.front(), ufds_.size(), poll_timeout);
   if (!ofds)
   {
-    ROS_ERROR_STREAM("poll failed with error " << last_socket_error_string());
+    if (last_socket_error() != EINTR)
+    {
+      ROS_ERROR_STREAM("poll failed with error " << last_socket_error_string());
+    }
   }
   else
   {