Author: bugman Date: Mon Oct 6 11:17:19 2008 New Revision: 7527 URL: http://svn.gna.org/viewcvs/relax?rev=7527&view=rev Log: Fix for a bug introduced at r7519. The problem was being picked up by the unit tests. The duplicate_data() model-free method was failing when sequence data was missing from the source data pipe. This was supposed to be caught in the code before r7519 but the wrong data pipe was being checked and the code was removed at that revision. Modified: 1.3/specific_fns/model_free/main.py Modified: 1.3/specific_fns/model_free/main.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=7527&r1=7526&r2=7527&view=diff ============================================================================== --- 1.3/specific_fns/model_free/main.py (original) +++ 1.3/specific_fns/model_free/main.py Mon Oct 6 11:17:19 2008 @@ -1109,6 +1109,10 @@ # The data must match! if data_from != data_to: raise RelaxError, "The object " + `data_name` + " is not consistent between the pipes " + `pipe_from` + " and " + `pipe_to` + "." + + # No sequence data, so skip the rest. + if dp_from.mol.is_empty(): + return # Duplicate the sequence data if it doesn't exist. if dp_to.mol.is_empty():