/88_tools/hotfixer$ ./hot_fix.sh start-jsk/rtmros_hironx 351 /opt/ros/hydro/lib/python2.7/dist-packages/hironx_ros_bridge 4
;; download patch file https://github.com/start-jsk/rtmros_hironx/pull/351.diff
diff --git a/hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py b/hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py
index dbd0426..cab796d 100644
--- a/hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py
+++ b/hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py
@@ -53,6 +53,34 @@
'https://github.com/start-jsk/rtmros_hironx/issues ' + \
'about the issue you are seeing is appreciated.'
+def delete_module(modname, paranoid=None):
:
(cut)
:
+#
+__name__ = "ImpedanceControllerService_idl"
+
+_exported_modules = ( "OpenHRP", )
+
+# The end.
diff --git a/hironx_ros_bridge/src/hironx_ros_bridge/hrpsys_315_1_9/hrpsys/__init__.py b/hironx_ros_bridge/src/hironx_ros_bridge/hrpsys_315_1_9/hrpsys/__init__.py
new file mode 100644
index 0000000..cdb66cd
--- /dev/null
+++ b/hironx_ros_bridge/src/hironx_ros_bridge/hrpsys_315_1_9/hrpsys/__init__.py
@@ -0,0 +1,2 @@
+import sys, os
+sys.path.append(os.path.dirname(__file__))
sudo patch -fN -p3 < /tmp/2382.patch
patching file hironx_ros_bridge/hironx_client.py
Hunk #3 FAILED at 656.
Hunk #4 FAILED at 687.
2 out of 4 hunks FAILED -- saving rejects to file hironx_ros_bridge/hironx_client.py.rej
patching file hironx_ros_bridge/hrpsys_315_1_9/hrpsys/ImpedanceControllerService_idl.py
patching file hironx_ros_bridge/hrpsys_315_1_9/hrpsys/__init__.py
patching file hironx_ros_bridge/hironx_client.py
Hunk #1 FAILED at 53.
Hunk #2 FAILED at 152.
Hunk #3 FAILED at 656.
Hunk #4 FAILED at 744.
4 out of 4 hunks FAILED -- saving rejects to file hironx_ros_bridge/hironx_client.py.rej
The next patch, when reversed, would delete the file hironx_ros_bridge/hrpsys_315_1_9/hrpsys/ImpedanceControllerService_idl.py,
which does not exist! Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file hironx_ros_bridge/hrpsys_315_1_9/hrpsys/__init__.py,
which does not exist! Skipping patch.
1 out of 1 hunk ignored
ERROR: failed to patch
$ ./hot_fix.sh start-jsk/rtmros_hironx 351 /opt/ros/hydro/lib/python2.7/dist-packages/hironx_ros_bridge 4
$ ./hot_fix.sh start-jsk/rtmros_hironx 351 /opt/ros/hydro/lib/python2.7/dist-packages/hironx_ros_bridge 4
$ cd /opt/ros/hydro/lib/python2.7/dist-packages/hironx_ros_bridge
/opt/ros/hydro/lib/python2.7/dist-packages/hironx_ros_bridge$ sudo patch -fN -p4 < /tmp/2382.patch
patching file hironx_client.py
Hunk #1 succeeded at 46 with fuzz 2 (offset -7 lines).
Hunk #2 FAILED at 152.
Hunk #3 FAILED at 648.
Hunk #4 FAILED at 679.
3 out of 4 hunks FAILED -- saving rejects to file hironx_client.py.rej
The next patch would create the file hrpsys_315_1_9/hrpsys/ImpedanceControllerService_idl.py,
which already exists! Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file hrpsys_315_1_9/hrpsys/__init__.py,
which already exists! Skipping patch.
1 out of 1 hunk ignored
Manual workaround that worked for the above case was to
cdinto the directory that the patch aims at. Despite the errors ofHUNK, the patch seems to be applied: