Merge from V6_main 01/04/2013

[modules/smesh.git] / src / Tools / padder / spadderpy / gui / plugindialog.py

diff --git a/src/Tools/padder/spadderpy/gui/plugindialog.py b/src/Tools/padder/spadderpy/gui/plugindialog.py
index e62d7fdad5d5375c4fcb18c6af6ecfe3060a535c..87666f579cf072fd39a74297c64e2561bd9fbf36 100644 (file)
--- a/src/Tools/padder/spadderpy/gui/plugindialog.py
+++ b/src/Tools/padder/spadderpy/gui/plugindialog.py
@@ -1,5 +1,5 @@
 # -*- coding: iso-8859-1 -*-
-# Copyright (C) 2011-2012  EDF R&D
+# Copyright (C) 2011-2013  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -340,14 +340,14 @@ class PluginDialog(QDialog):
             return
 
         meshJobResults = jobManager.finalize(self.__jobid)
-        if state == "ERROR":
-            self.__log("ERR: jobid = "+str(self.__jobid)+" ended with error: "+meshJobResults.status)
-            self.__log("ERR: %s"%jobManager.getLastErrorMessage())
+        logsdirname = os.path.join(meshJobResults.results_dirname, "logs")
+        if state == "ERROR" or meshJobResults.status is not True:
+            msgtemp = "ERR: jobid = %s ended with error: %s"
+            self.__log(msgtemp%(str(self.__jobid),jobManager.getLastErrorMessage()))
+            self.__log("ERR: see log files in %s"%logsdirname)
             return
 
-        logsdirname = os.path.join(meshJobResults.results_dirname, "logs")
-        self.__log("INF:  jobid="+str(self.__jobid)+" ended normally   : "+meshJobResults.status)
-        self.__log("INF:  jobid="+str(self.__jobid)+" see log files in : "+logsdirname)
+        self.__log("INF:  jobid=%s ended normally (see log files in %s)"%(str(self.__jobid),logsdirname))
 
         medfilename = os.path.join(meshJobResults.results_dirname,
                                    meshJobResults.outputmesh_filename)