[Greater-commits] r3694 - in branches/3.0.0-all-models/GREAT-ERModel: . GreaterModel/Worker

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 12:37:02 +0200 (Tue, 26 Jul 2011)
New Revision: 3694

Modified:
   branches/3.0.0-all-models/GREAT-ERModel/
   branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/worker.py
Log:
Merged revisions 3584 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ERModel

........
  r3584 | aheinecke | 2011-07-14 16:57:16 +0200 (Thu, 14 Jul 2011) | 2 lines
  
  Correctly use the representation of the tuple, as intended
........



Property changes on: branches/3.0.0-all-models/GREAT-ERModel
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ERModel:1-216,321,3583
   + /trunk/GREAT-ERModel:1-216,321,3583-3584

Modified: branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/worker.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/worker.py	2011-07-26 10:36:03 UTC (rev 3693)
+++ branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/worker.py	2011-07-26 10:37:02 UTC (rev 3694)
@@ -133,7 +133,7 @@
                 # An unknown status of the calculation. Return an error to
                 # the caller of the start_calculation method.
                 err = ValueError("Unknown calculation status %s"
-                                 % repr(status, progress))
+                                 % repr((status, progress)))
                 deferred.errback(err)
         except:
             log.err(Failure())