r21353 - in /branches/relax_disp: ./ pipe_control/spectrum.py -- October 31, 2013 - 09:28

Author: bugman
Date: Thu Oct 31 09:28:00 2013
New Revision: 21353

URL: http://svn.gna.org/viewcvs/relax?rev=21353&view=rev
Log:
Merged revisions 21352 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r21352 | bugman | 2013-10-31 09:27:40 +0100 (Thu, 31 Oct 2013) | 3 lines
  
  The pipe_control.spectrum.add_spectrum_id() function now returns silently 
if the ID already exists.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/spectrum.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 31 09:28:00 2013
@@ -1,1 +1,1 @@
-/trunk:1-21350
+/trunk:1-21352

Modified: branches/relax_disp/pipe_control/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/spectrum.py?rev=21353&r1=21352&r2=21353&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/spectrum.py (original)
+++ branches/relax_disp/pipe_control/spectrum.py Thu Oct 31 09:28:00 2013
@@ -255,7 +255,7 @@
 
     # The ID already exists.
     if spectrum_id in cdp.spectrum_ids:
-        raise RelaxError("The spectrum ID '%s' already exists." % 
spectrum_id)
+        return
 
     # Add the ID.
     cdp.spectrum_ids.append(spectrum_id)