Hi Michael,
Did you see the my comments about the patch at
https://mail.gna.org/public/relax-devel/2010-05/msg00006.html? These
major issues need to be addressed before the patches are applied -
they are not acceptable in their current form. The same issue occurs
with the 'dauvergne_patch' file:
[edw...@localhost relax-1.3]$ patch -p0 < dauvergne_patch
patching file auto_analyses/dauvergne_protocol.py
Hunk #4 FAILED at 229.
1 out of 16 hunks FAILED -- saving rejects to file
auto_analyses/dauvergne_protocol.py.rej
[edw...@localhost relax-1.3]$
The problem is the following part of the patch:
@@ -222,7 +229,7 @@
self.status = Status()
self.status.dAuvergne_protocol.diff_model = diff_model
self.status.dAuvergne_protocol.mf_models = mf_models
- self.status.dAuvergne_protocol.local_mf_models = local_tm_models
+ self.status.dAuvergne_protocol.local_tm_models = local_tm_models
# Load the interpreter.
self.interpreter = Interpreter(show_script=False, quit=False,
raise_relax_error=True)
I have already made this change - it is in the 1.3 line! So you will
need to update your 1.3 line code before making the patch with 'svn
diff'.
Cheers,
Edward
On 19 May 2010 01:12, Michael Bieri <[email protected]> wrote:
>
> Follow-up Comment #51, task #6847 (project relax):
>
> Hi Edward
>
> I made another set of patches for the auto_analysis scripts, but this time in
> three separate patches. I hope you will not get the same error message as
> before (https://mail.gna.org/public/relax-devel/2010-05/msg00009.html).
>
> I typed in 'svn up' so this should not be the problem.
>
> Cheers
> Michael
>
> (file #9168, file #9169, file #9170)
> _______________________________________________________
>
> Additional Item Attachment:
>
> File name: dauvergne_patch Size:9 KB
> File name: noe_patch Size:7 KB
> File name: relax_fit_patch Size:8 KB
>
>
> _______________________________________________________
>
> Reply to this item at:
>
> <http://gna.org/task/?6847>
>
> _______________________________________________
> Message sent via/by Gna!
> http://gna.org/
>
>
> _______________________________________________
> relax (http://nmr-relax.com)
>
> This is the relax-devel mailing list
> [email protected]
>
> To unsubscribe from this list, get a password
> reminder, or change your subscription options,
> visit the list information page at
> https://mail.gna.org/listinfo/relax-devel
>
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-devel mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-devel
