diff options
author | Michael Opdenacker <michael.opdenacker@bootlin.com> | 2021-10-05 10:33:34 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-11 18:41:39 +0100 |
commit | 12ca5f7209126ea6e07b3ba93fbdb31065971454 (patch) | |
tree | 4921b85e12de4445a61a0f0cbd055ca561275d90 | |
parent | e89193298ada8ea35fde2fe6a88b638766db1bde (diff) | |
download | poky-12ca5f7209126ea6e07b3ba93fbdb31065971454.tar.gz |
devpyshell: rename to pydevshell
For consistency with "pydevshell" which is also used.
This addresses [YOCTO #14531]
(From OE-Core rev: 958133f4e97275d1f2c74a7e715c4506cca3582f)
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/devshell.bbclass | 10 | ||||
-rw-r--r-- | meta/conf/documentation.conf | 2 | ||||
-rwxr-xr-x | 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 () { | |||
34 | d.delVarFlag("do_devshell", "fakeroot") | 34 | d.delVarFlag("do_devshell", "fakeroot") |
35 | } | 35 | } |
36 | 36 | ||
37 | def devpyshell(d): | 37 | def pydevshell(d): |
38 | 38 | ||
39 | import code | 39 | import code |
40 | import select | 40 | import select |
@@ -140,17 +140,17 @@ def devpyshell(d): | |||
140 | os.kill(child, signal.SIGTERM) | 140 | os.kill(child, signal.SIGTERM) |
141 | break | 141 | break |
142 | 142 | ||
143 | python do_devpyshell() { | 143 | python do_pydevshell() { |
144 | import signal | 144 | import signal |
145 | 145 | ||
146 | try: | 146 | try: |
147 | devpyshell(d) | 147 | pydevshell(d) |
148 | except SystemExit: | 148 | except SystemExit: |
149 | # Stop the SIGTERM above causing an error exit code | 149 | # Stop the SIGTERM above causing an error exit code |
150 | return | 150 | return |
151 | finally: | 151 | finally: |
152 | return | 152 | return |
153 | } | 153 | } |
154 | addtask devpyshell after do_patch | 154 | addtask pydevshell after do_patch |
155 | 155 | ||
156 | do_devpyshell[nostamp] = "1" | 156 | 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 | |||
17 | do_configure[doc] = "Configures the source by enabling and disabling any build-time and configuration options for the software being built" | 17 | do_configure[doc] = "Configures the source by enabling and disabling any build-time and configuration options for the software being built" |
18 | do_configure_ptest_base[doc] = "Configures the runtime test suite included in the software being built" | 18 | do_configure_ptest_base[doc] = "Configures the runtime test suite included in the software being built" |
19 | do_deploy[doc] = "Writes deployable output files to the deploy directory" | 19 | do_deploy[doc] = "Writes deployable output files to the deploy directory" |
20 | do_devpyshell[doc] = "Starts an interactive Python shell for development/debugging" | 20 | do_pydevshell[doc] = "Starts an interactive Python shell for development/debugging" |
21 | do_devshell[doc] = "Starts a shell with the environment set up for development/debugging" | 21 | do_devshell[doc] = "Starts a shell with the environment set up for development/debugging" |
22 | do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel" | 22 | do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel" |
23 | do_fetch[doc] = "Fetches the source code" | 23 | 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) | |||
43 | nonblockingfd(sys.stdin) | 43 | nonblockingfd(sys.stdin) |
44 | 44 | ||
45 | 45 | ||
46 | histfile = os.path.expanduser("~/.oedevpyshell-history") | 46 | histfile = os.path.expanduser("~/.oepydevshell-history") |
47 | readline.parse_and_bind("tab: complete") | 47 | readline.parse_and_bind("tab: complete") |
48 | try: | 48 | try: |
49 | readline.read_history_file(histfile) | 49 | readline.read_history_file(histfile) |