From 958133f4e97275d1f2c74a7e715c4506cca3582f Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Tue, 5 Oct 2021 10:33:34 +0200 Subject: devpyshell: rename to pydevshell For consistency with "pydevshell" which is also used. This addresses [YOCTO #14531] Signed-off-by: Michael Opdenacker Signed-off-by: Alexandre Belloni --- meta/classes/devshell.bbclass | 10 +++++----- meta/conf/documentation.conf | 2 +- scripts/oepydevshell-internal.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass index 76dd0b42ee..62dc958d9a 100644 --- a/meta/classes/devshell.bbclass +++ b/meta/classes/devshell.bbclass @@ -34,7 +34,7 @@ python () { d.delVarFlag("do_devshell", "fakeroot") } -def devpyshell(d): +def pydevshell(d): import code import select @@ -140,17 +140,17 @@ def devpyshell(d): os.kill(child, signal.SIGTERM) break -python do_devpyshell() { +python do_pydevshell() { import signal try: - devpyshell(d) + pydevshell(d) except SystemExit: # Stop the SIGTERM above causing an error exit code return finally: return } -addtask devpyshell after do_patch +addtask pydevshell after do_patch -do_devpyshell[nostamp] = "1" +do_pydevshell[nostamp] = "1" diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index c5a38b0764..80ad8e10d5 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -17,7 +17,7 @@ do_compile_ptest_base[doc] = "Compiles the runtime test suite included in the so do_configure[doc] = "Configures the source by enabling and disabling any build-time and configuration options for the software being built" do_configure_ptest_base[doc] = "Configures the runtime test suite included in the software being built" do_deploy[doc] = "Writes deployable output files to the deploy directory" -do_devpyshell[doc] = "Starts an interactive Python shell for development/debugging" +do_pydevshell[doc] = "Starts an interactive Python shell for development/debugging" do_devshell[doc] = "Starts a shell with the environment set up for development/debugging" do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel" do_fetch[doc] = "Fetches the source code" diff --git a/scripts/oepydevshell-internal.py b/scripts/oepydevshell-internal.py index 96c078ef3d..e3c35bbe2c 100755 --- a/scripts/oepydevshell-internal.py +++ b/scripts/oepydevshell-internal.py @@ -43,7 +43,7 @@ nonblockingfd(pty) nonblockingfd(sys.stdin) -histfile = os.path.expanduser("~/.oedevpyshell-history") +histfile = os.path.expanduser("~/.oepydevshell-history") readline.parse_and_bind("tab: complete") try: readline.read_history_file(histfile) -- cgit 1.2.3-korg