diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-08-01 08:16:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-01 08:16:10 +0000 |
| commit | d243f06786373634d9d21e3cda0e5539f107f528 (patch) | |
| tree | 1da2830c007ec682ae37a1e22bb849890de6dcc9 /dev-lang/python | |
| parent | Sync package.use.mask and 2007.0/package.use.mask wrt #253361. (diff) | |
| download | historical-d243f06786373634d9d21e3cda0e5539f107f528.tar.gz historical-d243f06786373634d9d21e3cda0e5539f107f528.tar.bz2 historical-d243f06786373634d9d21e3cda0e5539f107f528.zip | |
Bug #248081 - Fix tests not to assume that stdin is a tty.
Package-Manager: portage-2.2_rc33_p13863/cvs/Linux i686
Diffstat (limited to 'dev-lang/python')
| -rw-r--r-- | dev-lang/python/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/python/Manifest | 14 | ||||
| -rw-r--r-- | dev-lang/python/python-2.6.2-r1.ebuild | 10 |
3 files changed, 23 insertions, 6 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 9fb043a2fc58..fb2f62fc4f0e 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/python # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.396 2009/07/31 14:03:29 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.397 2009/08/01 08:16:10 zmedico Exp $ + + 01 Aug 2009; Zac Medico <zmedico@gentoo.org> python-2.6.2-r1.ebuild: + Bug #248081 - Fix tests not to assume that stdin is a tty. 31 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild: diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 18904e275853..fd825309c6cf 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1 AUX pydoc.init 666 RMD160 11caf3a78bce4cdaebacaf21eaf26cc1ce30282e SHA1 88c5cb6d5bf737c74e1be93118cf157630af9ad7 SHA256 0d25c71232b74adb87dc709cc7cd8f8b13c452c0fe82fa33808f907f7a96d628 AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6 @@ -16,6 +19,13 @@ DIST python-gentoo-patches-2.6.2-r1.tar.bz2 9706 RMD160 8868231a1759cfeb4497c409 EBUILD python-2.4.6.ebuild 9940 RMD160 2659cc53772a494bfd89a1a3fc6fb05f35b3d17d SHA1 c311eea6081f01a87b352f6e31c96bb2862b3e4e SHA256 55e8e995800a3380dd6bcbd6167c19aec53a7fb77bb3e1226ea752ab76a9dfba EBUILD python-2.5.4-r2.ebuild 10691 RMD160 01893e25086cbbcbac9d5aecf2fab2d887a42b2b SHA1 3a99dfdacf14dd215d3415d5174e85a82b14f1c0 SHA256 6c220c17509b37b3651000ef05e2c4513b5f0ffd78080d9963c7255c696a35df EBUILD python-2.5.4-r3.ebuild 8491 RMD160 44e95b1ebad9b3928ac041c226c71f771832cbdf SHA1 2880c22976e592ebd0ec4382f2c08b47dfe35092 SHA256 1d6140123a0d072165e79218dea3185ebb2c43fd5856f6d039d6dd5b9e4cb17e -EBUILD python-2.6.2-r1.ebuild 8542 RMD160 63df9ec82798b4ea67966c807ebfd3a12b49d68d SHA1 4fa5408cc267a26f9c566cdbaa0d9ae08ff44059 SHA256 508d6b4446101fb91183f2494d3af70dae3bde926673e897b305453b5bc760af -MISC ChangeLog 69497 RMD160 c432bae992aab93271cb75596b268a804fc08a45 SHA1 88e977c853a84c0771776fbf70f8a99b43250a5d SHA256 75f5181926902782d9343173f71f4ffdc758b54f0dde6de4875fb852664117d0 +EBUILD python-2.6.2-r1.ebuild 8664 RMD160 bead70e5ae158bef78259562dd2c3995b203fcc4 SHA1 473851f27fca21a39a4621f13f72739caaf1c9f7 SHA256 3095a676195c8e90b702aaa76b748013655983bf951fc88250e52009f3bf5410 +MISC ChangeLog 69629 RMD160 7cff1f4981a67b0d457dc99e2bd3584e0098386d SHA1 d2f3a709a605bb84dd505ba86a28849f15141e7d SHA256 ffdcd61c3f28ea195ec839e6dd07c32432df4b74e522a6bc6a9b2cfac06154b5 MISC metadata.xml 392 RMD160 fdfedaa26755e003666b05603b0ce755803d6dc9 SHA1 5f41eb4e4506b47d59d4ecee399f82de15a77ff1 SHA256 c11535a9200c35e4c92cbb7a241513502e6fc7ee047d12f6b54f82a1dd637c44 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkpz+ekACgkQ/ejvha5XGaNt+ACgktWros4UDkoQX3hH5yhSdUvq +VAAAoL325CWSDF3Pw4yCWd+UO4DyL5ID +=/hI+ +-----END PGP SIGNATURE----- diff --git a/dev-lang/python/python-2.6.2-r1.ebuild b/dev-lang/python/python-2.6.2-r1.ebuild index 086d11045b84..e80bd27cdb88 100644 --- a/dev-lang/python/python-2.6.2-r1.ebuild +++ b/dev-lang/python/python-2.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r1.ebuild,v 1.3 2009/07/31 14:03:29 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r1.ebuild,v 1.4 2009/08/01 08:16:10 zmedico Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -190,9 +190,13 @@ src_test() { mv "${S}"/Lib/test/test_${test}.py "${T}" done - # Redirect stdin from /dev/tty as a workaround for bug #248081. + # Fix OtherFileTests.testStdin() not to assume + # that stdin is a tty for bug #248081. + sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" \ + -i "${S}"/Lib/test/test_file.py || die "sed failed" + # Rerun failed tests in verbose mode (regrtest -w). - EXTRATESTOPTS="-w" make test < /dev/tty || die "make test failed" + EXTRATESTOPTS="-w" make test || die "make test failed" for test in ${skip_tests}; do mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py |