diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-07-10 14:03:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-10 14:03:25 +0000 |
| commit | 05a01ea8178c1e0c775bc257b88a3970c65fa294 (patch) | |
| tree | f0f12a95411a2c19230f76dcbadae5eeafea099c /sys-apps | |
| parent | version bump. new version supports python 3.2. solving bug #318925. (diff) | |
| download | historical-05a01ea8178c1e0c775bc257b88a3970c65fa294.tar.gz historical-05a01ea8178c1e0c775bc257b88a3970c65fa294.tar.bz2 historical-05a01ea8178c1e0c775bc257b88a3970c65fa294.zip | |
Install minimal tests for preinst sanity check.
Package-Manager: portage-2.2.0_alpha43_p31/cvs/Linux i686
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/portage/Manifest | 12 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 23 |
3 files changed, 31 insertions, 9 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 9999bbe892a2..49a96df2816a 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.847 2011/07/09 09:31:22 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.848 2011/07/10 14:03:25 zmedico Exp $ + + 10 Jul 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: + Install minimal tests for preinst sanity check. 09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> portage-2.1.10.3.ebuild: ppc64 stable wrt #373523 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 9e9fd23d046c..26fb5aa24fee 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -20,15 +20,13 @@ EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9 EBUILD portage-2.1.9.50.ebuild 10294 RMD160 7f05e03d0edcc5da19a3fd43d05d42b3cdac808d SHA1 01290c37cc918290571bd5001ec743373c1caee2 SHA256 bb2895f72e3d8a76dde059415b8e625e2fef9e028ee245411e9f2b90a88ada61 EBUILD portage-2.2.0_alpha41.ebuild 11999 RMD160 ceb3ef89b2cb9fee4ec22db93f718c8f0fa8d3b0 SHA1 a95767e3b3e48936acf6a67e80d13cdbedde0669 SHA256 bdc6ad0ee7ff459d310b06e5dd37bc2cfea31e408e29e8999dc2e5b886df86dc EBUILD portage-2.2.0_alpha43.ebuild 11999 RMD160 15a08983d14f7b3819bf9e752bfd926708ffd57b SHA1 69a630fab561d43bcfef3d0bb1dd5d1e79bdbc9f SHA256 34a498d4a207a45a780aea2eee62ef5d26c22e70c6e1beba7e2479f991c8416e -EBUILD portage-9999.ebuild 11221 RMD160 c25d39ea4456a88d44accd919d72db70cea0a40d SHA1 3d36e13b47286b0f6577e90dfb1bdba015808117 SHA256 184fdf7963e9d2bac4b1c31e4b17fdb50fd9565b532103db4ead12e7cb6e6504 -MISC ChangeLog 36946 RMD160 386ea19da889439c666d145b8a0016f4bd095cb5 SHA1 564826db337aea31257676854f53d9b74b13d010 SHA256 c6b3a0b56ca0e364ef94264004bdc70ffe818c27662c13734ddc037061e0eb0d +EBUILD portage-9999.ebuild 12049 RMD160 c35ef85be636fb86a88c8cfb099902507d350f36 SHA1 c5d97ee053375d572dd1f7942c62cc54388db7cc SHA256 c4c1618512a5a16cab8af90433500190c12887c0d0854fefa61f282b2e7a52e9 +MISC ChangeLog 37062 RMD160 6dfcefc9fdf4bacc2810768ca046e36a9a5a6494 SHA1 3a5da2e3da89957f879c89330939e163585edbf9 SHA256 dfdf2270416550b17036e6ac991801ed63f0814f73abe3ac8c0d2e5ef7381e94 MISC metadata.xml 806 RMD160 511095d817e35ffce10ea738cc401176c9346caa SHA1 d25de76c2eaaab4a4b84191e7f33893bee81370d SHA256 cc5f451325114cd24263899ca84010c02700de03e21fe413661178a9431962d9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQECAAYFAk4YH/MACgkQIiMqcbOVdxRBNwP9EvK3KOAMLbOWSEIulmiLmHsq -6vquJ1u7f5Q1hhTL6jjmq9M/o205LbCzZ0MVV5gJimCTLyyD0QGHgly3OuGj3Tdd -EplVIDXLf2IzGQ3bJZ+/QwKcpCsU2r+HLgKAXKmyf4KA3QZBPVLPKJOOv9E6UjTU -xeJLwMk2Y1lY+GA6XDI= -=MmPm +iEYEARECAAYFAk4ZsSkACgkQ/ejvha5XGaNvqQCgm7yan3KxmCii9tr7vhbBa/Vs +98EAn1FRcaW4zSvCTsZcYYm0oxt0cRAm +=0XWm -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 15700228ad15..0e172cd130c7 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.27 2011/06/28 10:03:46 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.28 2011/07/10 14:03:25 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -220,6 +220,18 @@ src_install() { fi done + # We install some minimal tests for use as a preinst sanity check. + # These tests must be able to run without a full source tree and + # without relying on a previous portage instance being installed. + cd "$S" || die "cd failed" + exeinto $portage_base/pym/portage/tests || die + doexe pym/portage/tests/runTests || die + insinto $portage_base/pym/portage/tests || die + doins pym/portage/tests/*.py || die + insinto $portage_base/pym/portage/tests/lint || die + doins pym/portage/tests/lint/*.py || die + doins pym/portage/tests/lint/__test__ || die + # Symlinks to directories cause up/downgrade issues and the use of these # modules outside of portage is probably negligible. for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do @@ -261,6 +273,15 @@ src_install() { } pkg_preinst() { + if [[ $ROOT == / ]] ; then + # Run some minimal tests as a sanity check. + local test_runner=$(find "$D" -name runTests) + if [[ -n $test_runner && -x $test_runner ]] ; then + einfo "Running preinst sanity tests..." + "$test_runner" || die "preinst sanity tests failed" + fi + fi + if ! use build && ! has_version dev-python/pycrypto && \ ! has_version '>=dev-lang/python-2.6[ssl]' ; then ewarn "If you are an ebuild developer and you plan to commit ebuilds" |