From: Doug Evans <dje@google.com>
Date: Wed, 19 May 2010 21:57:24 +0000 (+0000)
Subject: 	* python.c (source_python_script): Add comment.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3a1d4620d60dd678aa4d5a62f877caf0a5f209f1;p=binutils-gdb.git

	* 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 927a080088c..0c827b945d9 100644
--- 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 f03af2e1701..9c1e8bd485b 100644
--- 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;