From 3fb56ed9fc33fa00aa7271e73da5a68a8d29c56c Mon Sep 17 00:00:00 2001 From: Andrey Grozin Date: Mon, 3 May 2010 20:54:31 +0000 Subject: [PATCH] Improved test-nice patch Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- ChangeLog | 4 ++++ Manifest | 5 +++-- execnet-1.0.6.ebuild | 4 ++-- files/execnet-1.0.6-test-nice.patch | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 files/execnet-1.0.6-test-nice.patch diff --git a/ChangeLog b/ChangeLog index abb4234..1c8b0c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header$ + 03 May 2010; Andrey Grozin execnet-1.0.6.ebuild, + +files/execnet-1.0.6-test-nice.patch: + Improved test-nice patch + *execnet-1.0.6 (03 May 2010) 03 May 2010; Arfrever Frehtes Taifersar Arahesis diff --git a/Manifest b/Manifest index c7f496a..87ea5c9 100644 --- a/Manifest +++ b/Manifest @@ -1,7 +1,8 @@ AUX execnet-1.0.5-test-nice.patch 632 RMD160 ea47fa452f1c559f9acfb971ed737e3ce5f6c10e SHA1 8daaf8a6c624d5aa2331b37ce1ae727c137cca00 SHA256 77f5269993d77bcf57ade4a316734de214de64b38e2aa40360905c056765f50d +AUX execnet-1.0.6-test-nice.patch 635 RMD160 f3ae8d3d164a758948a5d0c848f57ec55b7f6856 SHA1 81618857d621a2e82b5b1f7ddd265c937a622ce4 SHA256 2ea871122eff878c7aa33a1c5e9e64b50d239a06560e7d3e855d6fb932e4e6c9 DIST execnet-1.0.5.tar.gz 181584 RMD160 6817aaf0407879ffc26de86acad9488b26547270 SHA1 dae1a6ab1543c63b5a33b7cf213bfc0e97a453ef SHA256 10086e21bfec19e6aeb15972209c812e4d4ece6b3c1b8b7515c21eeefefc8dc9 DIST execnet-1.0.6.tar.gz 181531 RMD160 90415884aaee38a9fe28a4d3dec64c7d42a158ac SHA1 847125226d55b38e3b04d8455257873f22dbae2f SHA256 420cdf55e752d4b990fbcbf720b6825b53eb4dcdceeb077cdc40c3f014f97a9a EBUILD execnet-1.0.5.ebuild 1125 RMD160 eaed579ee5c8195ad82346ae59d173e83288c49a SHA1 2f992e1fd9e00663c2525b5f6cc4c2ed6e7d288b SHA256 6f86358fe3828d24335e79c5101dba47e4c49035d1912bbe255e08908d049536 -EBUILD execnet-1.0.6.ebuild 1096 RMD160 cb51089d392c794b71e8196fba6ee01c8df189c1 SHA1 5810c31945addb6358a4b1ad96d7e011271b4ac8 SHA256 f004d4a1f49fd8cbfc5091347c566c2ec7fff35eb71fac7d35f0098c30a8633d -MISC ChangeLog 1083 RMD160 05712c5b11c4f0c5615f17297f24e69ceef722e3 SHA1 7a31117cf0e5dd55ada53106e57156c0292089ab SHA256 992375d429191f7853af851f6cdaee172c6fcd7717cd7f387e5e34a6211f0a6d +EBUILD execnet-1.0.6.ebuild 1088 RMD160 5752a655194a5735f86ab0de5ade32d78b03cd1d SHA1 9d4f69e2b6f2430abc0a9a29a4c0144f8dd648ea SHA256 b46128ebad9665972b7d591604ae2de858068d5a7b3e0df552f7808ba43a2cc6 +MISC ChangeLog 1220 RMD160 ddd1627459adfa936ca1dc9bb9dca4c314bdbaa0 SHA1 8866f2d00ba2f4264f1b6fb0cf7d2ce4dcf19491 SHA256 4c397bddb0d10dd8eae68f9f93849081d22862cdaa589ea65e9733a1d9f79ca2 MISC metadata.xml 375 RMD160 fa55887fbec717c8f8d946ec2d32ff420c906d83 SHA1 b34a98e7a27a1b1cfb04647fd5eb0c65fee4c787 SHA256 4fa41cf1cfe3171a09abf4fd8b8d69ad0039893b0a134fac53b4084e4de87009 diff --git a/execnet-1.0.6.ebuild b/execnet-1.0.6.ebuild index 87b918e..22dcbfb 100644 --- a/execnet-1.0.6.ebuild +++ b/execnet-1.0.6.ebuild @@ -9,7 +9,7 @@ DISTUTILS_SRC_TEST="py.test" inherit distutils eutils DESCRIPTION="Rapid multi-Python deployment" -HOMEPAGE="http://codespeak.net/execnet/ http://pypi.python.org/pypi/execnet" +HOMEPAGE="http://codespeak.net/execnet/ http://pypi.python.org/pypi/execnet/" SRC_URI="http://pypi.python.org/packages/source/e/${PN}/${P}.tar.gz" LICENSE="GPL-2" @@ -25,7 +25,7 @@ src_prepare() { distutils_src_prepare # fixing test with nice, bug #301417 - epatch "${FILESDIR}/${PN}-1.0.5-test-nice.patch" + epatch "${FILESDIR}/${P}-test-nice.patch" } src_compile() { diff --git a/files/execnet-1.0.6-test-nice.patch b/files/execnet-1.0.6-test-nice.patch new file mode 100644 index 0000000..6119fcb --- /dev/null +++ b/files/execnet-1.0.6-test-nice.patch @@ -0,0 +1,17 @@ +diff -r -U1 execnet-1.0.6.orig/testing/test_xspec.py execnet-1.0.6/testing/test_xspec.py +--- execnet-1.0.6.orig/testing/test_xspec.py 2010-04-21 16:19:48.000000000 +0200 ++++ execnet-1.0.6/testing/test_xspec.py 2010-05-03 22:12:56.000000000 +0200 +@@ -72,2 +72,8 @@ + def test_popen_nice(self): ++ import os ++ localnice = os.nice(0) ++ MAXNICE = 19 ++ nice = localnice+5 ++ if nice > MAXNICE: ++ nice = MAXNICE + gw = execnet.makegateway("popen//nice=5") +@@ -81,3 +87,3 @@ + if remotenice is not None: +- assert remotenice == 5 ++ assert remotenice == nice + -- 2.26.2