From: Renaud Barate <renaud.barate@edf.fr>
Date: Wed, 9 Nov 2011 10:06:41 +0000 (+0000)
Subject: Remove error message in MACRO caused by context
X-Git-Tag: LOGILAB~280
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e0265139a13e54d0490e1da2cf54f2b7318075e0;p=tools%2Feficas.git

Remove error message in MACRO caused by context
---

diff --git a/Ihm/I_MACRO_ETAPE.py b/Ihm/I_MACRO_ETAPE.py
index e9d1b967..b8e62389 100644
--- a/Ihm/I_MACRO_ETAPE.py
+++ b/Ihm/I_MACRO_ETAPE.py
@@ -536,7 +536,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE):
     except:
        # Impossible de construire le jdc auxiliaire (sortie par exception)
        l=traceback.format_exception_only("Fichier invalide",sys.exc_info()[1])
-       if self.jdc.appli:
+       if self.jdc.appli is not None:
           self.jdc.appli.affiche_alerte("Erreur lors de l'evaluation du fichier inclus",
                                         message="Ce fichier ne sera pas pris en compte\n"+string.join(l)
                                        )
diff --git a/Noyau/context.py b/Noyau/context.py
index 2573b505..315829de 100644
--- a/Noyau/context.py
+++ b/Noyau/context.py
@@ -39,7 +39,8 @@ def set_current_step(step):
    global _root
    if _root : raise "Impossible d'affecter _root. Il devrait valoir None"
    _root=step
-   message.debug(SUPERV, "current_step = %s", step.nom, stack_id=-1)
+   if step is not None:
+     message.debug(SUPERV, "current_step = %s", step.nom, stack_id=-1)
 
 def get_current_step():
    """