diff options
| author | Scott Murray <scott.murray@konsulko.com> | 2022-02-17 17:09:35 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 23:37:26 +0000 |
| commit | f7fccbe289c216b5bee7336d433589192f9cb6b0 (patch) | |
| tree | 845110860b9730205a3af1a2722aa55a08ed841b /bitbake/bin/toaster | |
| parent | 4f77505d94a8f6260933f457e9848d1d2fa98ce5 (diff) | |
| download | poky-f7fccbe289c216b5bee7336d433589192f9cb6b0.tar.gz | |
bitbake: bitbake: Replace remaining "abort" usage
In line with the inclusive language migration defined at:
https://wiki.yoctoproject.org/wiki/Inclusive_language
replace the remaining usage of "abort" in documentation, error
messages, and comments with halt/fail/exit as appropriate.
A couple of external Javascript API calls in Toaster remain, as
they cannot currently be changed.
(Bitbake rev: bc27762bf3ffb4a20b58eace5302438c4a526626)
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin/toaster')
| -rwxr-xr-x | bitbake/bin/toaster | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 8711014cfe..558a819570 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
| @@ -33,7 +33,7 @@ databaseCheck() | |||
| 33 | $MANAGE migrate --noinput || retval=1 | 33 | $MANAGE migrate --noinput || retval=1 |
| 34 | 34 | ||
| 35 | if [ $retval -eq 1 ]; then | 35 | if [ $retval -eq 1 ]; then |
| 36 | echo "Failed migrations, aborting system start" 1>&2 | 36 | echo "Failed migrations, halting system start" 1>&2 |
| 37 | return $retval | 37 | return $retval |
| 38 | fi | 38 | fi |
| 39 | # Make sure that checksettings can pick up any value for TEMPLATECONF | 39 | # Make sure that checksettings can pick up any value for TEMPLATECONF |
| @@ -41,7 +41,7 @@ databaseCheck() | |||
| 41 | $MANAGE checksettings --traceback || retval=1 | 41 | $MANAGE checksettings --traceback || retval=1 |
| 42 | 42 | ||
| 43 | if [ $retval -eq 1 ]; then | 43 | if [ $retval -eq 1 ]; then |
| 44 | printf "\nError while checking settings; aborting\n" | 44 | printf "\nError while checking settings; exiting\n" |
| 45 | return $retval | 45 | return $retval |
| 46 | fi | 46 | fi |
| 47 | 47 | ||
