diff options
| author |   Marien Zwart <marienz@gentoo.org> | 2006-02-13 22:28:07 +0000 |
|---|---|---|
| committer | Marien Zwart <marienz@gentoo.org> | 2006-02-13 22:28:07 +0000 |
| commit | 38d6fa0fde1763ffc275909737960dacc07c1ea7 (patch) | |
| tree | 17370374f357aa0ac41133281b3561ac596f9c72 /eclass | |
| parent | Patch to make the tests succeed with twisted 2.1 and 2.2. No revision bump be... (diff) | |
| download | gentoo-2-38d6fa0fde1763ffc275909737960dacc07c1ea7.tar.gz gentoo-2-38d6fa0fde1763ffc275909737960dacc07c1ea7.tar.bz2 gentoo-2-38d6fa0fde1763ffc275909737960dacc07c1ea7.zip | |
Use --force when installing to make sure packages already installed get overwritten properly, support trial from twisted 2.2 and newer which do not support (or need) the -R option anymore.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/twisted.eclass | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/eclass/twisted.eclass b/eclass/twisted.eclass index def908a38fec..4f3618f46fd8 100644 --- a/eclass/twisted.eclass +++ b/eclass/twisted.eclass @@ -1,6 +1,6 @@ # Copyright 2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/eclass/twisted.eclass,v 1.2 2006/01/01 01:14:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/twisted.eclass,v 1.3 2006/02/13 22:28:07 marienz Exp $ # # Author: Marien Zwart <marienz@gentoo.org> # @@ -34,13 +34,17 @@ twisted_src_test() { mkdir -p "${T}/${spath}" cp -R "${ROOT}${spath}/twisted" "${T}/${spath}" || die if has_version ">=dev-lang/python-2.3"; then - ${python} setup.py install --root="${T}" --no-compile || die + ${python} setup.py install --root="${T}" --no-compile --force || die else - ${python} setup.py install --root="${T}" || die + ${python} setup.py install --root="${T}" --force || die fi cd "${T}/${spath}" || die + local trialopts + if ! has_version ">=dev-python/twisted-2.2"; then + trialopts=-R + fi PATH="${T}/usr/bin:${PATH}" PYTHONPATH="${T}/${spath}" \ - trial -R ${PN/-/.} || die "trial failed" + trial ${trialopts} ${PN/-/.} || die "trial failed" cd "${S}" rm -rf "${T}/${spath}" } |