* python.c (source_python_script): Add comment.

	(source_python_script_for_objfile): Remove unnecessary call to
	gdbpy_print_stack.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 927a080088c3bf525e23552f34c439f88e482018..0c827b945d958d1478bf3dcb4abb910a9f3368a6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-19  Doug Evans  <dje@google.com>
+
+       * python.c (source_python_script): Add comment.
+       (source_python_script_for_objfile): Remove unnecessary call to
+       gdbpy_print_stack.
+
 2010-05-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
            Sergio Durigan Junior  <sergiodj@redhat.com>
 

diff --git a/gdb/python/python.c b/gdb/python/python.c
index f03af2e17011697cb57be32859d8504127a1f27d..9c1e8bd485b50c8a8f730ab8a1c8c0d57d4057e9 100644 (file)
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -377,6 +377,8 @@ source_python_script (FILE *stream, const char *file)
 
   cleanup = ensure_python_env (get_current_arch (), current_language);
 
+  /* Note: If an exception occurs python will print the traceback and
+     clear the error indicator.  */
   PyRun_SimpleFile (stream, file);
 
   do_cleanups (cleanup);
@@ -480,10 +482,9 @@ source_python_script_for_objfile (struct objfile *objfile,
   cleanups = ensure_python_env (get_objfile_arch (objfile), current_language);
   gdbpy_current_objfile = objfile;
 
-  /* We don't want to throw an exception here -- but the user
-     would like to know that something went wrong.  */
-  if (PyRun_SimpleFile (stream, file))
-    gdbpy_print_stack ();
+  /* Note: If an exception occurs python will print the traceback and
+     clear the error indicator.  */
+  PyRun_SimpleFile (stream, file);
 
   do_cleanups (cleanups);
   gdbpy_current_objfile = NULL;