diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index e3c78675dc..0862a3548a 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -175,9 +175,15 @@ notify_chldexit() { verify_prereq() { # Verify prerequisites + regex="([0-9])\.([0-9])" + for line in `cat $BBBASEDIR/toaster-requirements.txt | grep Django` ; do + [[ `echo $line` =~ $regex ]] + required_major_version="${BASH_REMATCH[1]}" + required_minor_version="${BASH_REMATCH[2]}" + done - if ! echo "import django; print (1,) == django.VERSION[0:1] and django.VERSION[1:2][0] in (8,)" | python 2>/dev/null | grep True >/dev/null; then - printf "This program needs Django 1.8. Please install with\n\npip install django<=1.8.7\n" + if ! echo "import django; print ($required_major_version,) == django.VERSION[0:1] and django.VERSION[1:2][0] in ($required_minor_version,)" | python 2>/dev/null | grep True >/dev/null; then + printf "This program needs Django $required_major_version.$required_minor_version. Please install with\n\npip install -r $BBBASEDIR/toaster-requirements.txt\n" return 2 fi