4 out of 4 hunks FAILED

[130s]

/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

Manual workaround that worked for the above case was to cd into the directory that the patch aims at. Despite the errors of HUNK, the patch seems to be applied:

$ 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

[k-okada]

sudo apt-get remove --purge ros-hydro-hironx-ros-bridge and make sure that tehre are no files under

/opt/ros/hydro/lib/python2.7/dist-packages/hironx_ros_bridge

and try again

◉ Kei Okada

On Wed, Apr 8, 2015 at 12:27 PM, Isaac I.Y. Saito notifications@github.com wrote:

/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/hironxros bridge 4 $ ./hot_fix.sh start-jsk/rtmros_hironx 351 /opt/ros/hydro/lib/python2.7/dist-packages/hironx_ros_bridge 4

Manual workaround that worked for the above case was to cd into the directory that the patch aims at. Despite the errors of HUNK, the patch seems to be applied:

$ 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

— Reply to this email directly or view it on GitHub.

[534o]

It seems user already have 1.0.29, which include 351.diff patch, I'm not sure whey original code has -fN but it seems -N show more information.

ubuntu:/tmp/rtmros_hironx$ patch --dry-run -N  -p1 < 351.diff 
patching file hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py
Reversed (or previously applied) patch detected!  Skipping patch.
4 out of 4 hunks ignored -- saving rejects to file hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py.rej
The next patch would create the file hironx_ros_bridge/src/hironx_ros_bridge/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 hironx_ros_bridge/src/hironx_ros_bridge/hrpsys_315_1_9/hrpsys/__init__.py,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
ubuntu:/tmp/rtmros_hironx$ patch --dry-run -fN  -p1 < 351.diff 
patching file hironx_ros_bridge/src/hironx_ros_bridge/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_ros_bridge/src/hironx_ros_bridge/hironx_client.py.rej
The next patch would create the file hironx_ros_bridge/src/hironx_ros_bridge/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 hironx_ros_bridge/src/hironx_ros_bridge/hrpsys_315_1_9/hrpsys/__init__.py,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
ubuntu:/tmp/rtmros_hironx$ patch --dry-run   -p1 < 351.diff 
patching file hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py
Reversed (or previously applied) patch detected!  Assume -R? [n] n
Apply anyway? [n] n
Skipping patch.
4 out of 4 hunks ignored -- saving rejects to file hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py.rej
The next patch would create the file hironx_ros_bridge/src/hironx_ros_bridge/hrpsys_315_1_9/hrpsys/ImpedanceControllerService_idl.py,
which already exists!  Assume -R? [n] n
Apply anyway? [n] n
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file hironx_ros_bridge/src/hironx_ros_bridge/hrpsys_315_1_9/hrpsys/__init__.py,
which already exists!  Assume -R? [n] n
Apply anyway? [n] n
Skipping patch.
1 out of 1 hunk ignored
ubuntu:/tmp/rtmros_hironx$