|
@@ -112,7 +112,7 @@ stop_system()
|
|
|
|
|
|
verify_prereq() {
|
|
|
# Verify Django version
|
|
|
- reqfile=$(python -c "import os; print os.path.realpath('$BBBASEDIR/toaster-requirements.txt')")
|
|
|
+ reqfile=$(python -c "import os; print(os.path.realpath('$BBBASEDIR/toaster-requirements.txt'))")
|
|
|
exp='s/Django\([><=]\+\)\([^,]\+\),\([><=]\+\)\(.\+\)/'
|
|
|
exp=$exp'import sys,django;version=django.get_version().split(".");'
|
|
|
exp=$exp'sys.exit(not (version \1 "\2".split(".") and version \3 "\4".split(".")))/p'
|
|
@@ -163,7 +163,7 @@ fi
|
|
|
|
|
|
if [ "$TOASTER_CONF" = "" ]; then
|
|
|
TOASTER_CONF="$TEMPLATECONF/toasterconf.json"
|
|
|
- export TOASTER_CONF=$(python -c "import os; print os.path.realpath('$TOASTER_CONF')")
|
|
|
+ export TOASTER_CONF=$(python -c "import os; print(os.path.realpath('$TOASTER_CONF'))")
|
|
|
fi
|
|
|
|
|
|
if [ ! -f $TOASTER_CONF ]; then
|