Author: bugman Date: Mon Mar 11 12:31:45 2013 New Revision: 18759 URL: http://svn.gna.org/viewcvs/relax?rev=18759&view=rev Log: Merged revisions 18758 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r18758 | bugman | 2013-03-11 12:31:05 +0100 (Mon, 11 Mar 2013) | 3 lines Fix for one of the RelaxError messages from the SpinList.add_item() method. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/data/mol_res_spin.py Propchange: branches/frame_order_testing/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Mar 11 12:31:45 2013 @@ -1,1 +1,1 @@ -/trunk:1-18756 +/trunk:1-18758 Modified: branches/frame_order_testing/data/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/mol_res_spin.py?rev=18759&r1=18758&r2=18759&view=diff ============================================================================== --- branches/frame_order_testing/data/mol_res_spin.py (original) +++ branches/frame_order_testing/data/mol_res_spin.py Mon Mar 11 12:31:45 2013 @@ -248,7 +248,7 @@ # Spin number has been supplied. if spin_num != None: if self[i].num == spin_num: - raise RelaxError("The spin number '%s' already exists." % spin_name) + raise RelaxError("The spin number '%s' already exists." % spin_num) # No spin numbers. else: