r13965 - in /branches/gui_testing: ./ relax.py -- July 28, 2011 - 17:05

Author: bugman
Date: Thu Jul 28 17:05:18 2011
New Revision: 13965

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

........
  r13961 | bugman | 2011-07-28 16:53:26 +0200 (Thu, 28 Jul 2011) | 3 lines
  
  Fix for the overriding of the command line specified mode - the args must 
be processed anyway.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/relax.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 28 17:05:18 2011
@@ -1,1 +1,1 @@
-/1.3:1-13958
+/1.3:1-13964

Modified: branches/gui_testing/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/relax.py?rev=13965&r1=13964&r2=13965&view=diff
==============================================================================
--- branches/gui_testing/relax.py (original)
+++ branches/gui_testing/relax.py Thu Jul 28 17:05:18 2011
@@ -116,8 +116,9 @@
         self.generic = generic_fns
 
         # Process the command line arguments and determine the relax mode.
+        cmd_mode, log_file, tee_file = self.arguments()
         if not mode:
-            mode, log_file, tee_file = self.arguments()
+            mode = cmd_mode
 
         # Set up the warning system.
         relax_warnings.setup(self.pedantic)