| 1 |
rbu 08/10/04 17:49:04 |
| 2 |
|
| 3 |
Modified: ChangeLog mercurial-1.0.2.ebuild |
| 4 |
Log: |
| 5 |
Make tests run with Python 2.5 and FEATURES=userpriv, a patch by Lourdes Jones (bug #231280). |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r6 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.81 dev-util/mercurial/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mercurial/ChangeLog?rev=1.81&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mercurial/ChangeLog?rev=1.81&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mercurial/ChangeLog?r1=1.80&r2=1.81 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v |
| 18 |
retrieving revision 1.80 |
| 19 |
retrieving revision 1.81 |
| 20 |
diff -u -r1.80 -r1.81 |
| 21 |
--- ChangeLog 4 Oct 2008 15:30:07 -0000 1.80 |
| 22 |
+++ ChangeLog 4 Oct 2008 17:49:03 -0000 1.81 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-util/mercurial |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.80 2008/10/04 15:30:07 keytoaster Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.81 2008/10/04 17:49:03 rbu Exp $ |
| 28 |
+ |
| 29 |
+ 04 Oct 2008; Robert Buchholz <rbu@g.o> mercurial-1.0.2.ebuild: |
| 30 |
+ Make tests run with Python 2.5 and FEATURES=userpriv, a patch by Lourdes |
| 31 |
+ Jones (bug #231280). |
| 32 |
|
| 33 |
04 Oct 2008; Tobias Heinlein <keytoaster@g.o> |
| 34 |
mercurial-1.0.2.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 dev-util/mercurial/mercurial-1.0.2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: mercurial-1.0.2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- mercurial-1.0.2.ebuild 4 Oct 2008 15:30:07 -0000 1.2 |
| 51 |
+++ mercurial-1.0.2.ebuild 4 Oct 2008 17:49:03 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v 1.2 2008/10/04 15:30:07 keytoaster Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v 1.3 2008/10/04 17:49:03 rbu Exp $ |
| 57 |
|
| 58 |
inherit bash-completion elisp-common flag-o-matic eutils distutils |
| 59 |
|
| 60 |
@@ -75,6 +75,8 @@ |
| 61 |
} |
| 62 |
|
| 63 |
src_test() { |
| 64 |
+ local testdir="${T}/tests" |
| 65 |
+ mkdir -p -m1777 "${testdir}" || die |
| 66 |
cd "${S}/tests/" |
| 67 |
rm -f *svn* # Subversion tests fail with 1.5 |
| 68 |
rm -f test-convert-baz* # GNU Arch baz |
| 69 |
@@ -83,8 +85,17 @@ |
| 70 |
rm -f test-convert-git* # git |
| 71 |
rm -f test-convert-mtn* # monotone |
| 72 |
rm -f test-convert-tla* # GNU Arch tla |
| 73 |
+ rm -f test-doctest* # doctest always fails with python 2.5.x |
| 74 |
+ if ! has userpriv ${FEATURES}; then |
| 75 |
+ einfo "Removing tests which require user privileges to succeed" |
| 76 |
+ rm -f test-command-template # Test is broken when run as root |
| 77 |
+ rm -f test-convert # Test is broken when run as root |
| 78 |
+ rm -f test-lock-badness # Test is broken when run as root |
| 79 |
+ rm -f test-permissions # Test is broken when run as root |
| 80 |
+ rm -f test-pull-permission # Test is broken when run as root |
| 81 |
+ fi |
| 82 |
einfo "Running Mercurial tests ..." |
| 83 |
- python run-tests.py || die "test failed" |
| 84 |
+ python run-tests.py --tmpdir="${testdir}" || die "test failed" |
| 85 |
} |
| 86 |
|
| 87 |
pkg_postinst() { |
Archives