r2981 - in /tags/1.2.10: ./ specific_fns/model_free.py -- January 12, 2007 - 02:27

Author: bugman
Date: Fri Jan 12 02:26:40 2007
New Revision: 2981

URL: http://svn.gna.org/viewcvs/relax?rev=2981&view=rev
Log:
Merged r2980 from the 1.2 line using the command:
svn merge -r2979:2980 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2

........
  r2979 | bugman | 2007-01-12 12:19:49 +1100 (Fri, 12 Jan 2007) | 6 lines

  Fix for bug #8248 (https://gna.org/bugs/index.php?8248).

  The problem was that the truncated results lines from relax versions 1.2.0 
to 1.2.9 consisted of
  four columns and not three.
........


Modified:
    tags/1.2.10/   (props changed)
    tags/1.2.10/specific_fns/model_free.py

Propchange: tags/1.2.10/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 12 02:26:40 2007
@@ -1,1 +1,1 @@
-/1.3:1-2505,2941,2947,2950,2974,2976
+/1.3:1-2505,2941,2947,2950,2974,2976,2979

Modified: tags/1.2.10/specific_fns/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/tags/1.2.10/specific_fns/model_free.py?rev=2981&r1=2980&r2=2981&view=diff
==============================================================================
--- tags/1.2.10/specific_fns/model_free.py (original)
+++ tags/1.2.10/specific_fns/model_free.py Fri Jan 12 02:26:40 2007
@@ -3377,7 +3377,7 @@
             data = self.relax.data.res[self.run][self.res_index]
 
             # Backwards compatibility for the reading of the results file 
from versions 1.2.0 to 1.2.9.
-            if len(self.file_line) == 3:
+            if len(self.file_line) == 4:
                 continue
 
             # Set the nucleus type.