fix assumption of assert's return code; unpacker eclass relies on this (pms makes no gurantees, but might as well match portage)

(Portage version: 2.1.10.52/cvs/Linux x86_64)

4 files changed, 55 insertions, 28 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 61e3eb78c7cb..f2a32e065ab4 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,14 @@
 # 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.152 2012/04/11 19:44:50 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.153 2012/05/21 02:07:40 ferringb Exp $
+
+*pkgcore-0.7.7.8-r2 (21 May 2012)
+
+  21 May 2012; Brian Harring <ferringb@gentoo.org> -pkgcore-0.7.7.7-r1.ebuild,
+  -files/pkgcore-0.7.7.7-NameError-fix.patch, +pkgcore-0.7.7.8-r2.ebuild,
+  +files/pkgcore-0.7.7.8-ebuild-envs-assert.patch:
+  Fix issue in unpacker eclass where it has assumptions of portage behaviour
+  beyond PMS gurantees.
 
 *pkgcore-0.7.7.8-r1 (11 Apr 2012)
 
diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.7.7-NameError-fix.patch b/sys-apps/pkgcore/files/pkgcore-0.7.7.7-NameError-fix.patch
deleted file mode 100644
index 5675bdbd4811..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.7.7.7-NameError-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d461fda7bc07dd3e760e8467e24e73511c7bb03a Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Tue, 24 Jan 2012 07:09:56 -0800
-Subject: [PATCH] Fix NameError reported from IRC
-
----
- pkgcore/resolver/plan.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pkgcore/resolver/plan.py b/pkgcore/resolver/plan.py
-index ee7a9e7..bc86a67 100644
---- a/pkgcore/resolver/plan.py
-+++ b/pkgcore/resolver/plan.py
-@@ -787,7 +787,7 @@ class merge_plan(object):
-                     if not result:
-                         # ok, inserted a new version.  did it take care of the conflict?
-                         # it /may/ not have, via filling a different slot...
--                        result = self.state.find_atom_matches(x)
-+                        result = self.state.match_atom(x)
-                         if not result:
-                             # ignore the blocker, we resolved past it.
-                             continue
--- 
-1.7.8.4
-
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
new file mode 100644
index 000000000000..26b39bd157c3
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch
@@ -0,0 +1,43 @@
+From a34717465da31b1d5519e09b3e32202380c0a6ab Mon Sep 17 00:00:00 2001
+From: Brian Harring <ferringb@gmail.com>
+Date: Sat, 19 May 2012 17:28:54 -0700
+Subject: [PATCH] ebuild envs assert: ensure a zero exit code.
+
+_unpacker within unpacker eclass is sensitive to it, thus
+match portage behaviour.
+---
+ NEWS                                       |    4 ++++
+ 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
++++ b/pkgcore/ebuild/eapi-bash/exit-handling.lib
+@@ -5,7 +5,7 @@ assert() {
+ 	local _pipestatus=${PIPESTATUS[*]}
+ 	local x
+ 	for x in ${_pipestatus}; do
+-		[ "$x" != 0 ] && die "$@"
++		[ "$x" -eq 0 ] || die "$@"
+ 	done
+ }
+ 
+-- 
+1.7.8.5
+
diff --git a/sys-apps/pkgcore/pkgcore-0.7.7.7-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.7.7.8-r2.ebuild
index 86e722fdd7b3..047be17d947f 100644
--- a/sys-apps/pkgcore/pkgcore-0.7.7.7-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.7.7.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.7-r1.ebuild,v 1.1 2012/01/24 15:16:20 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.8-r2.ebuild,v 1.1 2012/05/21 02:07:41 ferringb Exp $
 
 EAPI="3"
 DISTUTILS_SRC_TEST="setup.py"
@@ -31,7 +31,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-${PV}-NameError-fix.patch"
+	epatch "${FILESDIR}/${PN}-${PV}"-fix-resolver-assert.patch
+	epatch "${FILESDIR}/${PN}-${PV}"-ebuild-envs-assert.patch
 }
 
 src_compile() {