diff options
| author |   Robert Buchholz <rbu@gentoo.org> | 2008-10-04 17:49:03 +0000 |
|---|---|---|
| committer | Robert Buchholz <rbu@gentoo.org> | 2008-10-04 17:49:03 +0000 |
| commit | f06ca39978336b42eb768136a53844e7843681d1 (patch) | |
| tree | 89b688986f0570b9bd9a931e827c416c0d19d462 /dev-util/mercurial | |
| parent | alpha/ia64 stable (diff) | |
| download | historical-f06ca39978336b42eb768136a53844e7843681d1.tar.gz historical-f06ca39978336b42eb768136a53844e7843681d1.tar.bz2 historical-f06ca39978336b42eb768136a53844e7843681d1.zip | |
Make tests run with Python 2.5 and FEATURES=userpriv, a patch by Lourdes Jones (bug #231280).
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r6 x86_64
Diffstat (limited to 'dev-util/mercurial')
| -rw-r--r-- | dev-util/mercurial/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/mercurial/Manifest | 14 | ||||
| -rw-r--r-- | dev-util/mercurial/mercurial-1.0.2.ebuild | 15 |
3 files changed, 20 insertions, 15 deletions
diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog index 274816e45fcf..cfa35c1cb7cb 100644 --- a/dev-util/mercurial/ChangeLog +++ b/dev-util/mercurial/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/mercurial # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.80 2008/10/04 15:30:07 keytoaster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.81 2008/10/04 17:49:03 rbu Exp $ + + 04 Oct 2008; Robert Buchholz <rbu@gentoo.org> mercurial-1.0.2.ebuild: + Make tests run with Python 2.5 and FEATURES=userpriv, a patch by Lourdes + Jones (bug #231280). 04 Oct 2008; Tobias Heinlein <keytoaster@gentoo.org> mercurial-1.0.2.ebuild: diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest index 5068bbcb031d..6ef5213852ae 100644 --- a/dev-util/mercurial/Manifest +++ b/dev-util/mercurial/Manifest @@ -1,19 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab AUX mercurial-1.0.1-87c704ac92d4-git-patch.patch 1739 RMD160 96394fb2bccc19c5115897a26336694d56a9f86c SHA1 032e3f0e7f52cb2801caf41c8df048c1418c562b SHA256 abdecd689f58d0b5ed43cf1b190bf46b01adceeaa415c9cbbd55130de973e0e0 DIST mercurial-1.0.1.tar.gz 809348 RMD160 f451ab56660f46a51b4588de966ec0718f38cd7b SHA1 ada3e6d2128283efeefb7b44f9a1e0dfc22d62f1 SHA256 f6206a982d8268aa972290c69929f2a3067d0ee36249d0c2f3aa781d13c58d9e DIST mercurial-1.0.2.tar.gz 815530 RMD160 0f163d19a12bbe7dcfc45f10cdab07f5b16e7b3a SHA1 6d5be655276770192b889cee279bdcc0aee977e3 SHA256 f96d985c04b57848cc142c206a22c2118941ff81e660824c29a859b5a652423a EBUILD mercurial-1.0.1-r2.ebuild 2288 RMD160 ab4d59956eed3e05af8a546e0781a469527a4b5b SHA1 2ffb259ebd1a4ced322780b20361d54b60281b24 SHA256 4ddc11044bef1c2bf217506df7e2d4c5bad245abd3bff65cf491b5a8af14f074 EBUILD mercurial-1.0.1-r3.ebuild 2766 RMD160 a02a449e3d694e03e07d7a30a602e46102c01f81 SHA1 e7781f9b3887dbd7446256236ee6b2cbbcf1ad3a SHA256 e5cb8fd600d2fb8dc7e68a7be489f231dd15311e9fd55f4eab198e617d4521ca -EBUILD mercurial-1.0.2.ebuild 2662 RMD160 8d1b6d0d61a095935c6585ce467c1d21d49e6dba SHA1 ee20dd83d66e94bd1ecfd01702328856284d3e22 SHA256 f4d846c975bb47422ddd36f7a0177518680aff0a3a702d1e02484e4dd9c5f241 -MISC ChangeLog 12069 RMD160 fed0c40ef2b6ad45d4165db130414d0fda2cbf66 SHA1 987629897f93b3682e531ce953349dd2ae950838 SHA256 0dd2941585a0e21078dfeb90530e9d5d2b134be92cac20910e2c7610e91d314d +EBUILD mercurial-1.0.2.ebuild 3217 RMD160 1879eda875f3dd22760650df8cd19456b5904a3b SHA1 ba32c280e059a0bcc8760d62c0a3b76d48801ee7 SHA256 300ab88c13e5ff6ed647692acdceb962f1255960cc6cb3460a467109efd242f2 +MISC ChangeLog 12233 RMD160 cfcfeb3d7ccc45e88664cd7958313bb0d9215356 SHA1 6660c8109a00287cd9fc4c700454176d9fa89d4f SHA256 ed2abf2753da53f3c32278dc86e5d7ccd8bd08ef918cc36834d77c51a9b90b29 MISC metadata.xml 645 RMD160 2a33b3987960796da78558e671c4e5e0c6f10241 SHA1 6cd04e19dc7796b53afe98a9831e128c4c96f3ca SHA256 e0b05e42345698eda32c513e3a8f14d8bf42d5344dcd804b1f2234da327524e2 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkjnjAkACgkQt3UOBHx+2m+2/QCcC2+z8nBIIBSGcq55s+VRWAY9 -dL4AnR1edF+kQFnbl2wBuk0M3dMqUSPp -=5avZ ------END PGP SIGNATURE----- diff --git a/dev-util/mercurial/mercurial-1.0.2.ebuild b/dev-util/mercurial/mercurial-1.0.2.ebuild index 6e680003a00c..9b0ddc05e12a 100644 --- a/dev-util/mercurial/mercurial-1.0.2.ebuild +++ b/dev-util/mercurial/mercurial-1.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v 1.2 2008/10/04 15:30:07 keytoaster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v 1.3 2008/10/04 17:49:03 rbu Exp $ inherit bash-completion elisp-common flag-o-matic eutils distutils @@ -75,6 +75,8 @@ EOF } src_test() { + local testdir="${T}/tests" + mkdir -p -m1777 "${testdir}" || die cd "${S}/tests/" rm -f *svn* # Subversion tests fail with 1.5 rm -f test-convert-baz* # GNU Arch baz @@ -83,8 +85,17 @@ src_test() { rm -f test-convert-git* # git rm -f test-convert-mtn* # monotone rm -f test-convert-tla* # GNU Arch tla + rm -f test-doctest* # doctest always fails with python 2.5.x + if ! has userpriv ${FEATURES}; then + einfo "Removing tests which require user privileges to succeed" + rm -f test-command-template # Test is broken when run as root + rm -f test-convert # Test is broken when run as root + rm -f test-lock-badness # Test is broken when run as root + rm -f test-permissions # Test is broken when run as root + rm -f test-pull-permission # Test is broken when run as root + fi einfo "Running Mercurial tests ..." - python run-tests.py || die "test failed" + python run-tests.py --tmpdir="${testdir}" || die "test failed" } pkg_postinst() { |