From 74d5dba06aa3b9ce3746da84325963cb6093672e Mon Sep 17 00:00:00 2001 From: "Yamashita, Yuu" Date: Fri, 11 Mar 2016 00:42:44 +0000 Subject: [PATCH] Fix wrong distro version checks for PyPy binaries --- plugins/python-build/share/python-build/pypy-2.4.0 | 4 ++-- plugins/python-build/share/python-build/pypy-2.5.0 | 4 ++-- plugins/python-build/share/python-build/pypy-2.5.1 | 4 ++-- plugins/python-build/share/python-build/pypy-2.6.0 | 4 ++-- plugins/python-build/share/python-build/pypy-2.6.1 | 4 ++-- plugins/python-build/share/python-build/pypy-4.0.0 | 4 ++-- plugins/python-build/share/python-build/pypy-4.0.1 | 4 ++-- plugins/python-build/share/python-build/pypy-5.0.0 | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/python-build/share/python-build/pypy-2.4.0 b/plugins/python-build/share/python-build/pypy-2.4.0 index e9696342..cc6bb69c 100644 --- a/plugins/python-build/share/python-build/pypy-2.4.0 +++ b/plugins/python-build/share/python-build/pypy-2.4.0 @@ -1,13 +1,13 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then install_package "pypy-2.4.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux.tar.bz2#a24adb366f87ac0eba829d7188a156a7d897e71893689fab06502c3f4152ac0e" "pypy" verify_py27 ensurepip else install_package "pypy-2.4-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.4-linux_i686-portable.tar.bz2#2a330bbeae038c143366982f2104bf4096752f1ec7520fc5608f0527c124b0c2" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true + require_distro "Ubuntu 12.04" || true install_package "pypy-2.4.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux-armel.tar.bz2#8362d634bf86fbfb3b99b578b13c0a9fd673b2b7580d6d65b4a181934c659ccd" "pypy" verify_py27 ensurepip ;; "linux-armhf" ) diff --git a/plugins/python-build/share/python-build/pypy-2.5.0 b/plugins/python-build/share/python-build/pypy-2.5.0 index 2376c498..c88ace02 100644 --- a/plugins/python-build/share/python-build/pypy-2.5.0 +++ b/plugins/python-build/share/python-build/pypy-2.5.0 @@ -1,13 +1,13 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then install_package "pypy-2.5.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux.tar.bz2#3dfd56a986d25929b4ed9f40a5484f72f1d513cd816cf8aaa683106c3391247c" "pypy" verify_py27 ensurepip else install_package "pypy-2.5-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-linux_i686-portable.tar.bz2#6cbe3e1a48900f22c8e4412f82906fba92dd4a165bac5fe6866a2a26383fe3b8" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true + require_distro "Ubuntu 12.04" || true install_package "pypy-2.5.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux-armel.tar.bz2#277fa6c61d63af96893dafd19e1ffea7b988397c6a0fd66cd99dc0db1029be56" "pypy" verify_py27 ensurepip ;; "linux-armhf" ) diff --git a/plugins/python-build/share/python-build/pypy-2.5.1 b/plugins/python-build/share/python-build/pypy-2.5.1 index f0dd7aed..7bfdf4f9 100644 --- a/plugins/python-build/share/python-build/pypy-2.5.1 +++ b/plugins/python-build/share/python-build/pypy-2.5.1 @@ -1,13 +1,13 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then install_package "pypy-2.5.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.1-linux.tar.bz2#c0035a2650cafcb384050a8c476ddc41c9fd40b0c3677fab68026f57c715907a" "pypy" verify_py27 ensurepip else install_package "pypy-2.5.1-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5.1-linux_i686-portable.tar.bz2#ed532ddde3332d10faa59af49854cacbca458c597889352e619a87ab22363063" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true + require_distro "Ubuntu 12.04" || true install_package "pypy-2.5.1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.1-linux-armel.tar.bz2#91d68551b6e738c1e47aaed869a6df8208abb8c60194a1647c6aa13c7363a61d" "pypy" verify_py27 ensurepip ;; "linux-armhf" ) diff --git a/plugins/python-build/share/python-build/pypy-2.6.0 b/plugins/python-build/share/python-build/pypy-2.6.0 index 640aa223..b1204cd7 100644 --- a/plugins/python-build/share/python-build/pypy-2.6.0 +++ b/plugins/python-build/share/python-build/pypy-2.6.0 @@ -1,13 +1,13 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then install_package "pypy-2.6.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-linux.tar.bz2#6e0b052c40a59bf5a85ee239980bbcab8b031b4c2bc33b99efe1b072977d9910" "pypy" verify_py27 ensurepip else install_package "pypy-2.6-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.6-linux_i686-portable.tar.bz2#e01db0984f7fecd80dadfb1d5f65118e596e3984d12643b4d552e83f92bff549" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true + require_distro "Ubuntu 12.04" || true install_package "pypy-2.6.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-linux-armel.tar.bz2#9d0cb9b15283f9c15f83c05293f8bd41d302c96090fd89b778f359df9bc8e619" "pypy" verify_py27 ensurepip ;; "linux-armhf" ) diff --git a/plugins/python-build/share/python-build/pypy-2.6.1 b/plugins/python-build/share/python-build/pypy-2.6.1 index 33016047..d6d9847c 100644 --- a/plugins/python-build/share/python-build/pypy-2.6.1 +++ b/plugins/python-build/share/python-build/pypy-2.6.1 @@ -3,14 +3,14 @@ case "$(pypy_architecture 2>/dev/null || true)" in install_package "pypy-2.6.1-freebsd64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.1-freebsd64.tar.bz2#58118e88ce01c1d48b31d293db40687efbdeba54334eb55ba96de9ecf3c39055" "pypy" verify_py27 ensurepip ;; "linux" ) - if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then install_package "pypy-2.6.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.1-linux.tar.bz2#d010b1f1aafdb01beb107f16843985508ce81698260ce830690686d9b2768c88" "pypy" verify_py27 ensurepip else install_package "pypy-2.6.1-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.6.1-linux_i686-portable.tar.bz2#af8f05790fe21bffdb0619d39f2890e2ecabe47bbd3b21c2c97b9778e4cdb378" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true + require_distro "Ubuntu 12.04" || true install_package "pypy-2.6.1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.1-linux-armel.tar.bz2#0ca15d289e78a82f927b375a016b7c3246accac5d7eebded4e32a496fb3245ab" "pypy" verify_py27 ensurepip ;; "linux-armhf" ) diff --git a/plugins/python-build/share/python-build/pypy-4.0.0 b/plugins/python-build/share/python-build/pypy-4.0.0 index 757016e1..330dd94a 100644 --- a/plugins/python-build/share/python-build/pypy-4.0.0 +++ b/plugins/python-build/share/python-build/pypy-4.0.0 @@ -1,13 +1,13 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then install_package "pypy-4.0.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.0-linux.tar.bz2#365600947775bc73a902a5b1d11f8b96cf49f07cdbbab28bb47240097b4bb4c5" "pypy" verify_py27 ensurepip else install_package "pypy-4.0-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-4.0-linux_i686-portable.tar.bz2#8d6b775a1fdc79db453f80e6b50cd9979d89be3714cd71d3af21bf9f56745610" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true + require_distro "Ubuntu 12.04" || true install_package "pypy-4.0.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.0-linux-armel.tar.bz2#612df41fa21c5bc95d8d3575e0d8c09f605de6f0684109222afa561672dd9c7b" "pypy" verify_py27 ensurepip ;; "linux-armhf" ) diff --git a/plugins/python-build/share/python-build/pypy-4.0.1 b/plugins/python-build/share/python-build/pypy-4.0.1 index 77158e87..600343cb 100644 --- a/plugins/python-build/share/python-build/pypy-4.0.1 +++ b/plugins/python-build/share/python-build/pypy-4.0.1 @@ -1,13 +1,13 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then install_package "pypy-4.0.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-linux.tar.bz2#721920fcbb6aefc9a98e868e32b7f4ea5fd68b7f9305d08d0a2595327c9c0611" "pypy" verify_py27 ensurepip else install_package "pypy-4.0.1-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-4.0.1-linux_i686-portable.tar.bz2#2a1078bf36372b1c2919c11c418860dd7f0d44c92e6772bb36490eaf793b5c47" "pypy" verify_py27 ensurepip fi ;; "linux-armel" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true + require_distro "Ubuntu 12.04" || true install_package "pypy-4.0.1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-linux-armel.tar.bz2#d1acdd45ebd34580dd632c63c95211f6bae5e9a8f7a46ffa6f0443286ff9f61b" "pypy" verify_py27 ensurepip ;; "linux-armhf" ) diff --git a/plugins/python-build/share/python-build/pypy-5.0.0 b/plugins/python-build/share/python-build/pypy-5.0.0 index 2e9791f0..cc16bf8c 100644 --- a/plugins/python-build/share/python-build/pypy-5.0.0 +++ b/plugins/python-build/share/python-build/pypy-5.0.0 @@ -1,10 +1,10 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true + require_distro "Ubuntu 10.04" || true install_package "pypy-5.0.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux.tar.bz2#a9cc9afa94ff1cde811626a70081c477c9840e7816c0562d1903fd823d222ceb" "pypy" verify_py27 ensurepip ;; "linux-armel" ) - require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true + require_distro "Ubuntu 12.04" || true install_package "pypy-5.0.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux-armel.tar.bz2#87bd85441b16ecca0d45ba6e9c0e9d26bb7bd8867afbf79d80312cf79b032dc1" "pypy" verify_py27 ensurepip ;; "linux-armhf" )