Re: [Xen-devel] Re: [PATCH] [Xend/Xm/ACM] [1/2] Implement legacy XML-RPC interface for ACM commands

[Keir Fraser <Keir.Fraser@xxxxxxxxxxxx>]

On 4/12/07 12:39, "Stefan Berger" <stefanb@xxxxxxxxxx> wrote:

> xen-devel-bounces@xxxxxxxxxxxxxxxxxxx wrote on 12/04/2007 06:33:42 AM:
>
> > Both these patches are reported as corrupt by 'patch'. This one on line 1159
> > of the patch; the other one on line 99. In both cases the immediately
> > preceding chunk fails to apply. 
>
> I just took the ones I posted with the mail program and they worked find. Also the ones I received back from the email list are ok. 
> If it's just two hunks that are corrupted, can you delete those hunks and commit it and I'll diff the trees and resend the missing parts? 


The errors I get are below, and occur with patch version 2.5.4 and 2.5.9. I suppose it could conceivably be metamail screwing up the patches when I extract them from the raw emails. Perhaps try resending the pair of patches in a zip file?

 -- Keir

viper:xen64.hg$ patch -p2 <../tmp/security_commands_through_xend.diff 
patching file tools/python/xen/xend/server/XMLRPCServer.py
patching file tools/python/xen/xm/addlabel.py
patching file tools/python/xen/xm/rmlabel.py
patching file tools/python/xen/util/xsm/acm/acm.py
patching file tools/python/xen/xm/resources.py
patching file tools/python/xen/xm/getlabel.py
patching file tools/python/xen/xm/labels.py
patching file tools/python/xen/xm/main.py
Hunk #4 FAILED at 2459.
1 out of 4 hunks FAILED -- saving rejects to file tools/python/xen/xm/main.py.rej
missing header for unified diff at line 1159 of patch
can't find file to patch at input line 1159
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|     'rmlabel',
--------------------------
File to patch: 

viper:xen64.hg$ patch -p2 <../tmp/xend_acm_new_storage_path.diff 
patching file tools/python/xen/xend/XendOptions.py
patching file tools/python/xen/xend/XendXSPolicyAdmin.py
Hunk #4 FAILED at 101.
1 out of 4 hunks FAILED -- saving rejects to file tools/python/xen/xend/XendXSPolicyAdmin.py.rej
missing header for unified diff at line 99 of patch
can't find file to patch at input line 99
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|         try:
--------------------------
File to patch: 



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel