[SCM] archer-jankratochvil-autoload: Merge branch 'secmove-misc2-safepath-debug-warn' into secmove-misc2-safepath-debug-warn-warnlocal

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-autoload has been updated
       via  3ddade37ad5dd06bba888c17af42570c1c4236b6 (commit)
       via  4099a5252ae90405342dafd1a74565f47ba2e3a6 (commit)
       via  c523676a6ab9ab1d636cd3fbb67d9376c1b103c4 (commit)
       via  2c3cee0ec6034776aa972a9790c570752fe7baa0 (commit)
       via  c7441fbd097db9a678163f7b65de6f2d597488c1 (commit)
       via  a6d3118b4a445bc75b09c624ca0cbd03792ad269 (commit)
      from  09ffdd20f5ea7fa9cb712822fc3fcc40f6163bbf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 3ddade37ad5dd06bba888c17af42570c1c4236b6
Merge: 09ffdd2 4099a52
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Mar 30 21:12:34 2012 +0200

    Merge branch 'secmove-misc2-safepath-debug-warn' into secmove-misc2-safepath-debug-warn-warnlocal

commit 4099a5252ae90405342dafd1a74565f47ba2e3a6
Merge: 7e5f3cb c523676
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Mar 30 21:12:33 2012 +0200

    Merge branch 'secmove-misc2-safepath-debug' into secmove-misc2-safepath-debug-warn

commit c523676a6ab9ab1d636cd3fbb67d9376c1b103c4
Merge: 01dfb8c 2c3cee0
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Mar 30 21:12:33 2012 +0200

    Merge branch 'secmove-misc2-safepath' into secmove-misc2-safepath-debug

commit 2c3cee0ec6034776aa972a9790c570752fe7baa0
Merge: 9b21009 c7441fb
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Mar 30 21:12:33 2012 +0200

    Merge branch 'secmove-misc2' into secmove-misc2-safepath

commit c7441fbd097db9a678163f7b65de6f2d597488c1
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Mar 30 21:12:03 2012 +0200

    .

commit a6d3118b4a445bc75b09c624ca0cbd03792ad269
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Mar 30 21:08:09 2012 +0200

    .

-----------------------------------------------------------------------

Summary of changes:
 gdb/python/py-auto-load.c |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

First 500 lines of diff:
diff --git a/gdb/python/py-auto-load.c b/gdb/python/py-auto-load.c
index 3ec181a..aa8ade4 100644
--- a/gdb/python/py-auto-load.c
+++ b/gdb/python/py-auto-load.c
@@ -246,6 +246,9 @@ info_auto_load_python_scripts (char *pattern, int from_tty)
 void
 gdbpy_initialize_auto_load (void)
 {
+  struct cmd_list_element *cmd;
+  char *cmd_name;
+
   add_setshow_boolean_cmd ("python-scripts", class_support,
 			   &auto_load_python_scripts, _("\
 Set the debugger's behaviour regarding auto-loaded Python scripts."), _("\
@@ -259,9 +262,21 @@ This options has security implications for untrusted inferiors."),
 
   add_setshow_boolean_cmd ("auto-load-scripts", class_support,
 			   &auto_load_python_scripts, _("\
-Deprecated alias for 'set auto-load python-scripts'."), _("\
-Deprecated alias for 'show auto-load python-scripts'."),
-			   NULL, NULL, NULL, &setlist, &showlist);
+Set the debugger's behaviour regarding auto-loaded Python scripts, "
+								 "deprecated."),
+			   _("\
+Show the debugger's behaviour regarding auto-loaded Python scripts, "
+                                                                 "deprecated."),
+			   NULL, NULL, show_auto_load_python_scripts,
+			   &setlist, &showlist);
+  cmd_name = "auto-load-scripts";
+  cmd = lookup_cmd (&cmd_name, setlist, "", -1, 1);
+  deprecate_cmd (cmd, "set auto-load python-scripts");
+
+  /* It is needed because lookup_cmd updates the CMD_NAME pointer.  */
+  cmd_name = "auto-load-scripts";
+  cmd = lookup_cmd (&cmd_name, showlist, "", -1, 1);
+  deprecate_cmd (cmd, "show auto-load python-scripts");
 
   add_cmd ("python-scripts", class_info, info_auto_load_python_scripts,
 	   _("Print the list of automatically loaded Python scripts.\n\


hooks/post-receive
--
Repository for Project Archer.