k-okada
commented
8 years ago rtm.py is installed under /pt/ros/lib/python2.7/dist-packages.... but test-hrpsysconf.py is isntalled under /opt/ros/share/...., which is different from patch files asuming ./python/rtm.py and ./test/test-hrpsys....
◉ Kei Okada
On Tue, Apr 19, 2016 at 6:31 PM, Isaac I.Y. Saito notifications@github.com wrote:
This may be basically the same issue with #4 https://github.com/tork-a/88_tools/issues/4, but I'm not sure so opening a new issue.
./hot_fix.sh fkanehiro/hrpsys-base 978 /opt/ros/indigo/lib/python2.7/dist-packages/hrpsys 0 : |diff --git a/python/rtm.py b/python/rtm.py |index c36bf47..1239c83 100644 |--- a/python/rtm.py
|+++ b/python/rtm.py
No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 18 Perhaps you used the wrong -p or --strip option?
I tried to change -p / --strip= value from 0 to 8 ( /opt/ros/indigo/lib/python2.7/dist-packages/hrpsys/rtm.py has 8 slashes) but got all the same result.
I noticed that the paths of the targetted file and one up directory are different:
- in .diff file: python/rtm.py
- of installed version: hrpsys/rtm.py
Longer log:
./hot_fix.sh fkanehiro/hrpsys-base 978 /opt/ros/indigo/lib/python2.7/dist-packages/hrpsys 0
�[32m;; download patch file https://github.com/fkanehiro/hrpsys-base/pull/978.diff�[0m �[33m diff --git a/python/rtm.py b/python/rtm.py index c36bf47..1239c83 100644 --- a/python/rtm.py +++ b/python/rtm.py @@ -538,7 +538,7 @@ def connectPorts(outP, inPs, subscription="flush", dataflow="Push", bufferlength print('[rtm.py] \033[31m Failed to connect %s to %s(%s)\033[0m' % \ (outP.get_port_profile().name, inP, inPs)) continue
- if isConnected(outP, inP) == True and False:
if isConnected(outP, inP) == True: print('[rtm.py] %s and %s are already connected' % \ (outP.get_port_profile().name, inP.get_port_profile().name)) continuediff --git a/test/test-hrpsysconf.py b/test/test-hrpsysconf.py index a84e360..aa501e5 100755 --- a/test/test-hrpsysconf.py +++ b/test/test-hrpsysconf.py @@ -23,12 +23,29 @@ def init(self, robotname="SampleRobot(Robot)0", url=""):
class TestHrpsysConfig(unittest.TestCase): global h
- rh = None
seq = None
def test_import_waitinput(self):
https://github.com/start-jsk/rtmros_hironx/blob/groovy-devel/hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py
from waitInput import waitInputConfirm, waitInputSelect self.assertTrue(True)
- def test_createcomp(self):
- global h
- self.seq = h.createComp("SequencePlayer",'seq')[0] +
- def test_connectcomp(self):
- global h
- if self.seq == None or self.rh == None:
- self.test_createcomp()
- connectPorts(self.rh.port("q"), self.seq.port("qInit"))
check number of connection
- assert(len(self.seq.port("qInit").get_connector_profiles()) == 1)
check do not connect again if already connected for https://github.com/fkanehiro/hrpsys-base/issues/979
- connectPorts(self.rh.port("q"), self.seq.port("qInit"))
assert(len(self.seq.port("qInit").get_connector_profiles()) == 1)+ def test_findcomp(self): global h h.findComps() @@ -46,6 +63,13 @@ def setUp(self): rtm.nsport = args.port h = SampleHrpsysConfigurator()
h.waitForRTCManager()look for name
- for c in h.ms.get_components():
- if '(Robot)' in c.name() or 'RobotHardware' in c.name():
- h.waitForRobotHardware(c.name()) # get robot hardware name
- break;
self.rh = h.rhunittest.main()
if name == 'main': �[0m ./hot_fix.sh: line 31: cd: 2: No such file or directory �[32msudo patch -fN -p1 < /tmp/20024.patch�[0m can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
|diff --git a/python/rtm.py b/python/rtm.py |index c36bf47..1239c83 100644 |--- a/python/rtm.py
|+++ b/python/rtm.py
No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 18 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
|diff --git a/test/test-hrpsysconf.py b/test/test-hrpsysconf.py |index a84e360..aa501e5 100755 |--- a/test/test-hrpsysconf.py
|+++ b/test/test-hrpsysconf.py
No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
|diff --git a/python/rtm.py b/python/rtm.py |index c36bf47..1239c83 100644 |--- a/python/rtm.py
|+++ b/python/rtm.py
No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 18 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
|diff --git a/test/test-hrpsysconf.py b/test/test-hrpsysconf.py |index a84e360..aa501e5 100755 |--- a/test/test-hrpsysconf.py
|+++ b/test/test-hrpsysconf.py
No file to patch. Skipping patch. 2 out of 2 hunks ignored �[31mERROR: failed to patch�[0m
— You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub https://github.com/tork-a/88_tools/issues/12
130s
This may be basically the same issue with https://github.com/tork-a/88_tools/issues/4, but I'm not sure so opening a new issue.
I tried to change
-p / --strip=value from 0 to 8 (/opt/ros/indigo/lib/python2.7/dist-packages/hrpsys/rtm.pyhas 8 slashes) but got all the same result.I noticed that the paths of the targetted file and one up directory are different:
.difffile:python/rtm.pyhrpsys/rtm.pyLonger log: