From 5131ef521bce805f7f797d806e419ad50e673506 Mon Sep 17 00:00:00 2001 From: Josh Friend Date: Mon, 30 Mar 2015 13:31:05 -0400 Subject: [PATCH] fix required distros for pypy-2.5.x --- plugins/python-build/share/python-build/pypy-2.5.0 | 2 +- plugins/python-build/share/python-build/pypy-2.5.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bda6bafe..2376c498 100644 --- a/plugins/python-build/share/python-build/pypy-2.5.0 +++ b/plugins/python-build/share/python-build/pypy-2.5.0 @@ -19,7 +19,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in fi ;; "linux64" ) - if require_distro "Ubuntu 12.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then install_package "pypy-2.5.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux64.tar.bz2#7764fb6b662407f8709eaa334c542aac9cb6bfe3291ac198dad0980ca129f3c2" "pypy" verify_py27 ensurepip else install_package "pypy-2.5-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.5-linux_x86_64-portable.tar.bz2#26c5a0964b32b09be0282766c27937c843a12b6820ff2d440c6d47a6092837e0" "pypy" verify_py27 ensurepip 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 fe77fe3d..2aed0462 100644 --- a/plugins/python-build/share/python-build/pypy-2.5.1 +++ b/plugins/python-build/share/python-build/pypy-2.5.1 @@ -24,7 +24,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in fi ;; "linux64" ) - if require_distro "Ubuntu 12.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then install_package "pypy-2.5.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.1-linux64.tar.bz2#68e0955dbc80a0d51dfa9a8a76d8623f34920ece1bcbc6d910c2be019a653ba8" "pypy" verify_py27 ensurepip else # FIXME: portable distribution not yet available