summaryrefslogtreecommitdiffstats
path: root/bin/toaster
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2015-12-09 19:56:26 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-14 23:09:54 +0000
commit648b62654c52116451c6a68a46d7264db3a34d09 (patch)
treee3fe850d7f4bed48a58f8b15bef742946ad85b29 /bin/toaster
parentd7819508dac488a64be3caec88db285cda9599ab (diff)
downloadbitbake-contrib-648b62654c52116451c6a68a46d7264db3a34d09.tar.gz
toaster: Upgrade to Django 1.8.6 and remove South
Upgrade Django to long-term support version. Django now provides its own migration framework, so remove requirement for South. [YOCTO #8364] Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin/toaster')
-rwxr-xr-xbin/toaster8
1 files changed, 2 insertions, 6 deletions
diff --git a/bin/toaster b/bin/toaster
index 6d1ec0573..528e17e41 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -176,15 +176,11 @@ notify_chldexit() {
verify_prereq() {
# Verify prerequisites
- if ! echo "import django; print (1,) == django.VERSION[0:1] and django.VERSION[1:2][0] in (6,)" | python 2>/dev/null | grep True >/dev/null; then
- printf "This program needs Django 1.6. Please install with\n\npip install django==1.6\n"
+ 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"
return 2
fi
- if ! echo "import south; print reduce(lambda x, y: 2 if x==2 else 0 if x == 0 else y, map(lambda x: 1+cmp(x[1]-x[0],0), zip([0,8,4], map(int,south.__version__.split(\".\"))))) > 0" | python 2>/dev/null | grep True >/dev/null; then
- printf "This program needs South 0.8.4. Please install with\n\npip install south==0.8.4\n"
- return 2
- fi
return 0
}