diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-10 11:31:14 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-14 23:05:15 +0100 |
| commit | 519a85ef25a9c5552ce6478dcd39898c31cf1cd6 (patch) | |
| tree | 58ca2c19a20d17c06e9fe12e83b98d88b3e22827 | |
| parent | 3249e33251102069c88e2bc3f703cfab51444668 (diff) | |
| download | poky-519a85ef25a9c5552ce6478dcd39898c31cf1cd6.tar.gz | |
bitbake: toaster: use print function in toaster script
Used print() function instead of print statement
to make toaster script to work with both python 2 and python 3
[YOCTO #9584]
(Bitbake rev: 09d37ee51219edcd0be6fd24c82fce392533b39b)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 987d53c10d..921164c47e 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
| @@ -112,7 +112,7 @@ stop_system() | |||
| 112 | 112 | ||
| 113 | verify_prereq() { | 113 | verify_prereq() { |
| 114 | # Verify Django version | 114 | # Verify Django version |
| 115 | reqfile=$(python -c "import os; print os.path.realpath('$BBBASEDIR/toaster-requirements.txt')") | 115 | reqfile=$(python -c "import os; print(os.path.realpath('$BBBASEDIR/toaster-requirements.txt'))") |
| 116 | exp='s/Django\([><=]\+\)\([^,]\+\),\([><=]\+\)\(.\+\)/' | 116 | exp='s/Django\([><=]\+\)\([^,]\+\),\([><=]\+\)\(.\+\)/' |
| 117 | exp=$exp'import sys,django;version=django.get_version().split(".");' | 117 | exp=$exp'import sys,django;version=django.get_version().split(".");' |
| 118 | exp=$exp'sys.exit(not (version \1 "\2".split(".") and version \3 "\4".split(".")))/p' | 118 | exp=$exp'sys.exit(not (version \1 "\2".split(".") and version \3 "\4".split(".")))/p' |
| @@ -163,7 +163,7 @@ fi | |||
| 163 | 163 | ||
| 164 | if [ "$TOASTER_CONF" = "" ]; then | 164 | if [ "$TOASTER_CONF" = "" ]; then |
| 165 | TOASTER_CONF="$TEMPLATECONF/toasterconf.json" | 165 | TOASTER_CONF="$TEMPLATECONF/toasterconf.json" |
| 166 | export TOASTER_CONF=$(python -c "import os; print os.path.realpath('$TOASTER_CONF')") | 166 | export TOASTER_CONF=$(python -c "import os; print(os.path.realpath('$TOASTER_CONF'))") |
| 167 | fi | 167 | fi |
| 168 | 168 | ||
| 169 | if [ ! -f $TOASTER_CONF ]; then | 169 | if [ ! -f $TOASTER_CONF ]; then |
