diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2012-05-21 02:09:19 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2012-05-21 02:09:19 +0000 |
| commit | 6c17cc180c7b86921468d3a6e6970f2ebc7f1d00 (patch) | |
| tree | d05550b2971fb21dabcfd3ed6f361da31d8adeaf /sys-apps | |
| parent | fix assumption of assert's return code; unpacker eclass relies on this (pms m... (diff) | |
| download | gentoo-2-6c17cc180c7b86921468d3a6e6970f2ebc7f1d00.tar.gz gentoo-2-6c17cc180c7b86921468d3a6e6970f2ebc7f1d00.tar.bz2 gentoo-2-6c17cc180c7b86921468d3a6e6970f2ebc7f1d00.zip | |
Tweak the last commit; drop NEWS from the patch since it won't apply cleanly.
(Portage version: 2.1.10.52/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/pkgcore/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch | 15 |
2 files changed, 5 insertions, 16 deletions
diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog index f2a32e065ab4..ef1d9b1d8e8a 100644 --- a/sys-apps/pkgcore/ChangeLog +++ b/sys-apps/pkgcore/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/pkgcore # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.153 2012/05/21 02:07:40 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.154 2012/05/21 02:09:19 ferringb Exp $ + + 21 May 2012; Brian Harring <ferringb@gentoo.org> + files/pkgcore-0.7.7.8-ebuild-envs-assert.patch: + Tweak the last commit; drop NEWS from the patch since it won't apply cleanly. *pkgcore-0.7.7.8-r2 (21 May 2012) diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch b/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch index 26b39bd157c3..4b4268471472 100644 --- a/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch +++ b/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch @@ -10,21 +10,6 @@ match portage behaviour. pkgcore/ebuild/eapi-bash/exit-handling.lib | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) -diff --git a/NEWS b/NEWS -index 268b79a..dace98a 100644 ---- a/NEWS -+++ b/NEWS -@@ -5,6 +5,10 @@ See ChangeLog for full commit logs; this is summarized/major changes. - - pkgcore trunk: - -+* Gentoo's unpacker eclass is sensitive to the return code of -+ assert; this is outside of pms rules, but we've matched portage -+ behaviour to keep things working -+ - * Fixed pinspect portageq envvar support. - - * Added `pconfig world` for world file manipulation. diff --git a/pkgcore/ebuild/eapi-bash/exit-handling.lib b/pkgcore/ebuild/eapi-bash/exit-handling.lib index bf2fcdb..c02b2db 100644 --- a/pkgcore/ebuild/eapi-bash/exit-handling.lib |