ajout de traceback

darcs-hash:20080209010131-af139-e1cc9fd883d67c891dac9b8d602bff10aa35bf55.gz

bcfg2/plugins/Python.py

@@ -132,7 +132,16 @@ class Python(Bcfg2.Server.Plugin.Plugin):
 	    entry.text = pygen.generate(code, env)
             debug(entry.text)
         except Exception, e:
+            import traceback
+	    from cStringIO import StringIO
+	    s = StringIO()
+	    sys.stderr = s
+	    traceback.print_exc()
+	    sys.stderr = sys.__stderr__
+	    traceback = s.getvalue()
 	    logger.error('Python exec error: %s: %s' % (str(e.__class__).split('.', 2)[1], str(e)))
+	    for line in traceback.splitlines():
+		    logger.error('Python exec error: -> %s' % line)
 	    raise Bcfg2.Server.Plugin.PluginExecutionError
         entry.attrib['owner'] = env["info"]['owner']
         entry.attrib['group'] = env["info"]['group']

bcfg2/pygen.py

@@ -25,7 +25,7 @@ fichier de configuration à partir d'un script python'''
 
 __all__ = [ "Environment", "compileSource", "generate", "load" ]
 
-import re, marshal, os
+import re, marshal, os, sys
 from cStringIO import StringIO
 
 # Pour l'arrêt d'un script
@@ -180,8 +180,6 @@ def load(fname, cfname=None):
     return code
 
 if __name__ == "__main__":
-    import sys
-
     result = generate(load(sys.argv[1]))
 
     print "resultat:"