linux/poky.git/bitbake/lib/bb/pysh, branch honister-3.4.2

bitbake: pyshyacc: allow double COMMA statements

2020-07-12T10:53:00+00:00

this allows shell statements like '; ;' to pass the parser. As it may be bad code but still valid enough to execute (Bitbake rev: b7732b1b5085bea73e17d112e1bd9ac3d4dc34fb) Signed-off-by: Konrad Weihmann Signed-off-by: Richard Purdie

bitbake: bitbake: pysh: Improve error handling for shell code

2018-12-09T11:07:48+00:00

The p_error() is used for printing errors when parse shell code, but it can't the EOF error correctly - Add the following lines to quilt.inc do_configure_prepend () { find ${s} -name "*.in" -exec sed -i -e "1s,^#\!.*@perl@ -w$,#\! @perl@\nuse warnings;," {} \; if [ hello ]; then } - Before the patch: $ rm -fr cache/ tmp/cache/; bitbake -p [snip] WARNING: /path/to/quilt/quilt-native_0.65.bb: Error during finalise of /path/to/quilt/quilt-native_0.65.bb [snip] bb.pysh.sherrors.ShellSyntaxError: None followed by: We can see that this isn't easy to debug, let p_error() check wheter it is EOF and print appropriate errors can improve the error message. And don't let codeparser.py except pyshlex.NeedMore (in fact, it never worked since p_error() only raise ShellSyntaxError), but make it print the last 5 lines which might be useful for debuging. - After the patch $ rm -fr cache/ tmp/cache/; bitbake -p [snip] ERROR: /path/to/quilt/quilt_0.65.bb: Error during parse shell code, the last 5 lines are: find /path/to/quilt/0.65-r0/quilt-0.65 -name "*.in" -exec sed -i -e "1s,^#\!.*@PERL@ -w$,#\! @PERL@\nuse warnings;," {} \; if [ hello ]; then autotools_do_configure sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i /path/to/quilt/0.65-r0/quilt-0.65/Makefile [snip] File "/path/to/bb/pysh/pyshyacc.py", line 649, in p_error(p=None): w('Unexpected EOF') > raise sherrors.ShellSyntaxError(''.join(msg)) bb.pysh.sherrors.ShellSyntaxError: Unexpected EOF (Bitbake rev: 44790597951638e32eb1672de2e40bd5a603326b) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie

bitbake: pysh/pyshlex.py: Set is not importable

2018-12-09T11:07:48+00:00

>>> from Set import Set Traceback (most recent call last): File "", line 1, in ImportError: No module named 'Set' So remove related code. (Bitbake rev: 118e9d8894e64d102543562314b318676006e710) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie

bitbake: pysh/sherrors.py: Remove unused classes

2018-12-09T11:07:48+00:00

The only two that we need are ShellSyntaxError and ShellError, others are not used, so remove them. (Bitbake rev: abee2ff5ee71bf8c3221cd9d3cd4243ebb4ca273) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie

bitbake: pysh: Remove unused modules

2018-12-09T11:07:48+00:00

We don't use these modules in bitbake, so remove them. And pysh's author declared that pysh is no longer maintained: http://pysh.sourceforge.net/ (Bitbake rev: 9cc4f12d2aef366a593c7977d3818a3002b1d8bf) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie

bitbake: bitbake: Convert to python 3

2016-06-02T07:24:02+00:00

Various misc changes to convert bitbake to python3 which don't warrant separation into separate commits. (Bitbake rev: d0f904d407f57998419bd9c305ce53e5eaa36b24) Signed-off-by: Richard Purdie

bitbake: lib: fix no newline at end of file

2014-07-04T08:28:36+00:00

Add a '\n' to the last line of the file to fix: No newline at end of file (Bitbake rev: 54f1359ed2e9d47980cd221b7b43ef56543fe06d) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie

bitbake: pysh: Say what kind of token isn't implemented

2013-05-10T12:35:10+00:00

When the shell lexer finds an unrecognized dollar token, the error message should contain what kind of token it is having problems with. (Bitbake rev: 1acb9c338018c612db519d2db823c66b567863b9) Signed-off-by: Olof Johansson Signed-off-by: Richard Purdie

make exception handling syntax consistent

2011-06-15T10:13:13+00:00

Update exception handling syntax to use the modern style: except ExcType as localvar (Bitbake rev: dbf5f42b06bef81749b13aa99945cc1292a6676d) Signed-off-by: Scott Garman Signed-off-by: Richard Purdie

bitbake: Sync a load of whitespace and other non-functionality changes with bitbake uptream

2011-01-04T14:46:54+00:00

Signed-off-by: Richard Purdie