Xymon Mailing List Archive search

problem patching

5 messages in this thread

list Lars Ebeling · Mon, 28 Mar 2005 13:04:43 +0200 (CEST) ·
I'l give it another try. Could someone please help me.
 When patching I get this:
 $ /home/bb/patch -p1 < /tmp/post-rc6-v2_patch.txt                               (Stripping trailing CRs from patch.)                                            can't find file to patch at input line 4                                        Perhaps you used the wrong -p or --strip option?                                The text leading up to this was:                                                --------------------------                                                      ödiff -urN beta/hobbit-4.0-RC6/bbdisplay/acklog.c /tmp/hobbit-4.0-RC6/bbdisplay/
acklog.c                                                                        ö--- beta/hobbit-4.0-RC6/bbdisplay/acklog.c     2005-03-06 17:39:06.000000000 +0
100                                                                             ö+++ /tmp/hobbit-4.0-RC6/bbdisplay/acklog.c     2005-03-22 10:03:47.000000000 +0
100                                                                             --------------------------                                                      File to patch: $ pwd                                                            /home/hobbit/hobbit-4.0-RC6                                                     $                                 Regards
Lars                                              

Hobbithobbyist

The trouble with the world is that the stupid are cocksure and the intelligent are full of doubt.
--Bertrand Russell
list Henrik Størner · Mon, 28 Mar 2005 13:15:34 +0200 ·
▸ quoted from Lars Ebeling
On Mon, Mar 28, 2005 at 01:04:43PM +0200, lars ebeling wrote:
I'l give it another try. Could someone please help me.
 
When patching I get this:

$ /home/bb/patch -p1 < /tmp/post-rc6-v2_patch.txt
(Stripping trailing CRs from patch.)
can't find file to patch at input line 4
Duh - feel free to call me stupid. Badly generated patch, sorry.
Grab it again, and it should work.


Henrik
list Lars Ebeling · Mon, 28 Mar 2005 14:05:53 +0200 (CEST) ·
▸ quoted from Henrik Størner

Henrik Stoerner <user-ce4a2c883f75@xymon.invalid> wrote: 


On Mon, Mar 28, 2005 at 01:04:43PM +0200, lars ebeling wrote:
I'l give it another try. Could someone please help me.

When patching I get this:

$ /home/bb/patch -p1 < /tmp/post-rc6-v2_patch.txt
(Stripping trailing CRs from patch.)
can't find file to patch at input line 4
Duh - feel free to call me stupid. Badly generated patch, sorry.
Grab it again, and it should work.


Ok am I the first one patching the full patch? I had the same problem with "v1"
▸ quoted from Lars Ebeling

Regards

Lars


Hobbithobbyist

The trouble with the world is that the stupid are cocksure and the intelligent are full of doubt.
--Bertrand Russell
list Daniel J McDonald · Tue, 29 Mar 2005 15:01:44 -0600 ·
▸ quoted from Lars Ebeling
On Mon, 2005-03-28 at 14:05 +0200, lars ebeling wrote:

Henrik Stoerner <user-ce4a2c883f75@xymon.invalid> wrote: 
        
        
        On Mon, Mar 28, 2005 at 01:04:43PM +0200, lars ebeling wrote:
I'l give it another try. Could someone please help me.

When patching I get this:

$ /home/bb/patch -p1 < /tmp/post-rc6-v2_patch.txt
(Stripping trailing CRs from patch.)
can't find file to patch at input line 4
I'm trying to add the patch to the SRPM, and I get:
+ echo 'Patch #0 (post-RC6-v2.patch):'
Patch #0 (post-RC6-v2.patch):
+ patch -p1 -b --suffix .2 -s
The text leading up to this was:
|diff -urN hobbit-4.0-RC6/Changes-4.0 hobbit-4.0-RC6.2/Changes-4.0
|--- hobbit-4.0-RC6/Changes-4.0 2005-03-21 17:38:02.000000000 +0100
|+++ hobbit-4.0-RC6.2/Changes-4.0       2005-03-28 12:35:37.958731000
+0200
File to patch:

Most confused...
list Lars Ebeling · Wed, 30 Mar 2005 05:06:37 +0200 (CEST) ·
▸ quoted from Daniel J McDonald

Daniel J McDonald <user-290ce4e24e19@xymon.invalid> wrote:
On Mon, 2005-03-28 at 14:05 +0200, lars ebeling wrote:

Henrik Stoerner wrote: 


On Mon, Mar 28, 2005 at 01:04:43PM +0200, lars ebeling wrote:
I'l give it another try. Could someone please help me.

When patching I get this:

$ /home/bb/patch -p1 < /tmp/post-rc6-v2_patch.txt
(Stripping trailing CRs from patch.)
can't find file to patch at input line 4
I'm trying to add the patch to the SRPM, and I get:
+ echo 'Patch #0 (post-RC6-v2.patch):'
Patch #0 (post-RC6-v2.patch):
+ patch -p1 -b --suffix .2 -s
The text leading up to this was:
|diff -urN hobbit-4.0-RC6/Changes-4.0 hobbit-4.0-RC6.2/Changes-4.0
|--- hobbit-4.0-RC6/Changes-4.0 2005-03-21 17:38:02.000000000 +0100
|+++ hobbit-4.0-RC6.2/Changes-4.0 2005-03-28 12:35:37.958731000
+0200
File to patch:

Most confused...


I had no problems with the version 2 patch
▸ quoted from Lars Ebeling

Regards

Lars


Hobbithobbyist

The trouble with the world is that the stupid are cocksure and the intelligent are full of doubt.
--Bertrand Russell