diff options
-rw-r--r-- | dev-ros/roslaunch/files/timeout.patch | 18 | ||||
-rw-r--r-- | dev-ros/roslaunch/roslaunch-1.15.7.ebuild | 1 | ||||
-rw-r--r-- | dev-ros/roslaunch/roslaunch-9999.ebuild | 1 |
3 files changed, 0 insertions, 20 deletions
diff --git a/dev-ros/roslaunch/files/timeout.patch b/dev-ros/roslaunch/files/timeout.patch deleted file mode 100644 index 169b12813c70..000000000000 --- a/dev-ros/roslaunch/files/timeout.patch +++ /dev/null @@ -1,18 +0,0 @@ -Slow HW like the raspberry pi easily hit this timeout over NFS. -Increase it to 1 min. - -diff --git a/tools/roslaunch/src/roslaunch/launch.py b/tools/roslaunch/src/roslaunch/launch.py -index 9a3b931..8e33c0c 100644 ---- a/tools/roslaunch/src/roslaunch/launch.py -+++ b/tools/roslaunch/src/roslaunch/launch.py -@@ -57,8 +57,8 @@ from roslaunch.pmon import start_process_monitor, ProcessListener - - from roslaunch.rlutil import update_terminal_name - --_TIMEOUT_MASTER_START = 10.0 #seconds --_TIMEOUT_MASTER_STOP = 10.0 #seconds -+_TIMEOUT_MASTER_START = 60.0 #seconds -+_TIMEOUT_MASTER_STOP = 60.0 #seconds - - _ID = '/roslaunch' - diff --git a/dev-ros/roslaunch/roslaunch-1.15.7.ebuild b/dev-ros/roslaunch/roslaunch-1.15.7.ebuild index 963b1ae8e35c..a3f2abeb8889 100644 --- a/dev-ros/roslaunch/roslaunch-1.15.7.ebuild +++ b/dev-ros/roslaunch/roslaunch-1.15.7.ebuild @@ -30,7 +30,6 @@ DEPEND="${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )" -PATCHES=( "${FILESDIR}/timeout.patch" ) src_test() { rosdep update diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild index 963b1ae8e35c..a3f2abeb8889 100644 --- a/dev-ros/roslaunch/roslaunch-9999.ebuild +++ b/dev-ros/roslaunch/roslaunch-9999.ebuild @@ -30,7 +30,6 @@ DEPEND="${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )" -PATCHES=( "${FILESDIR}/timeout.patch" ) src_test() { rosdep update |