diff options
| author |   Marien Zwart <marienz@gentoo.org> | 2006-02-13 23:05:49 +0000 |
|---|---|---|
| committer | Marien Zwart <marienz@gentoo.org> | 2006-02-13 23:05:49 +0000 |
| commit | edbebb0eaaf5e0c54430f13d291de87ffff469ad (patch) | |
| tree | 4ea836af8bf4dc63098cfdf63b5b034ed7b36da0 /dev-python/ldaptor | |
| parent | Stop passing the -R option to trial (deprecated in twisted 2.1, removed in 2.2). (diff) | |
| download | gentoo-2-edbebb0eaaf5e0c54430f13d291de87ffff469ad.tar.gz gentoo-2-edbebb0eaaf5e0c54430f13d291de87ffff469ad.tar.bz2 gentoo-2-edbebb0eaaf5e0c54430f13d291de87ffff469ad.zip | |
Do not pass -R to trial versions that do not support it.
(Portage version: 2660-svn)
Diffstat (limited to 'dev-python/ldaptor')
| -rw-r--r-- | dev-python/ldaptor/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/ldaptor/Manifest | 16 | ||||
| -rw-r--r-- | dev-python/ldaptor/ldaptor-0.0.42.ebuild | 8 |
3 files changed, 13 insertions, 16 deletions
diff --git a/dev-python/ldaptor/ChangeLog b/dev-python/ldaptor/ChangeLog index 647e9d622bf3..06fe9796f69c 100644 --- a/dev-python/ldaptor/ChangeLog +++ b/dev-python/ldaptor/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/ldaptor # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.17 2006/02/02 19:09:16 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.18 2006/02/13 23:02:32 marienz Exp $ + + 13 Feb 2006; Marien Zwart <marienz@gentoo.org> ldaptor-0.0.42.ebuild: + Do not pass -R to trial versions that do not support it. 02 Feb 2006; Marien Zwart <marienz@gentoo.org> Manifest: Fix rmd160 digests. diff --git a/dev-python/ldaptor/Manifest b/dev-python/ldaptor/Manifest index c4ef67316f6e..256748ea69c1 100644 --- a/dev-python/ldaptor/Manifest +++ b/dev-python/ldaptor/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 5c7b954f0df4601339611442e335dcf1 ChangeLog 2156 RMD160 ef244408b6f546fccb5df023a584a7f3e09d6c16 ChangeLog 2156 SHA256 807deaad7b0a71ee89282fa256b053c8a3f3bbcf13ba2650888d913578c72749 ChangeLog 2156 @@ -13,19 +10,12 @@ SHA256 18c5bee2efb8f63f77692774a244156420e3848b32a45aa011ee1b3e7688f9f6 files/di MD5 da3a030bf2a5c7d1aad834223aa777ff files/ldaptor-0.0.42-trial-2.1-compat.patch 794 RMD160 68f9c8e6dd4dc0dfe128dac5729b2559afad350e files/ldaptor-0.0.42-trial-2.1-compat.patch 794 SHA256 e4111a713185f617dc586ac502c7c14a2e264c47051932e200dffc2757561903 files/ldaptor-0.0.42-trial-2.1-compat.patch 794 -MD5 ff3d398b529b72a79460c82de601f2fc ldaptor-0.0.42.ebuild 1969 -RMD160 247862bfa53c94a712e37488c98a3e0e86d2704b ldaptor-0.0.42.ebuild 1969 -SHA256 620127aeefbe54805a05cf95991d294e87c4d619fd945aa485222fb362bc6fda ldaptor-0.0.42.ebuild 1969 +MD5 98d58ba94e2af0113602b46628ccb56b ldaptor-0.0.42.ebuild 2066 +RMD160 9967ca57cda465040c91a20871d805679bf33c91 ldaptor-0.0.42.ebuild 2066 +SHA256 8ac45040fb9c2827a6678f897ecfa2ef5dbdda4536c63e51347e0a6265a3d9fd ldaptor-0.0.42.ebuild 2066 MD5 c8490f42970655cad51ec6ac8de4e8b5 ldaptor-0.0.6.ebuild 1252 RMD160 ee1aee340c051716080c6b200bdf0af7ab930b1e ldaptor-0.0.6.ebuild 1252 SHA256 819904650a1d1c65f6affeaa327b4f46b840ca4121177331eb2d373ed4c70750 ldaptor-0.0.6.ebuild 1252 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFD4ljtW78445TWHXcRAqS4AJ9x0MReaXSej1O7iLqA01ed8OdtKQCdFR2M -So/rTKgcaxw9Fw21zZ8MpyA= -=B6fa ------END PGP SIGNATURE----- diff --git a/dev-python/ldaptor/ldaptor-0.0.42.ebuild b/dev-python/ldaptor/ldaptor-0.0.42.ebuild index 665e7df46f21..98943c552a94 100644 --- a/dev-python/ldaptor/ldaptor-0.0.42.ebuild +++ b/dev-python/ldaptor/ldaptor-0.0.42.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.42.ebuild,v 1.4 2006/01/31 23:57:24 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.42.ebuild,v 1.5 2006/02/13 23:02:32 marienz Exp $ inherit distutils eutils @@ -74,5 +74,9 @@ src_install() { } src_test() { - trial -R ldaptor || die "test failed" + local trialopts + if ! has_version ">=dev-python/twisted-2.1"; then + trialopts=-R + fi + trial ${trialopts} ldaptor || die "test failed" } |