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

Package-Manager: portage-2.1.10.52/cvs/Linux x86_64

5 files changed, 61 insertions, 35 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/Manifest b/sys-apps/pkgcore/Manifest
index 62dc02ba8554..9584b41f6c49 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pkgcore-0.7.7.7-NameError-fix.patch 986 RMD160 ba4553304f6ad866a8936ae1753307592257502f SHA1 9ded642b192085686d388b5de5c78e15eb1c2b3f SHA256 b48d06c8117ed54fcf5859b51efcd1fd9b19eb6e0a4d3c8735dcf65318277834
+AUX pkgcore-0.7.7.8-ebuild-envs-assert.patch 1329 RMD160 204cfcae5172a90f750c3b7dd0bc03cca7d6437c SHA1 9115a103bf934a515bae934e9665a221c8f8a6d5 SHA256 6f072a5af46b18382bf6754dca1082a601cca9eb19fd95c2896821677ddc3612
 AUX pkgcore-0.7.7.8-fix-resolver-assert.patch 4386 RMD160 c3524c54b52d3542f867b8cde3e469764a60a108 SHA1 47008bd4c946812947cd89ba5a0e08378555dcc2 SHA256 ac33f503aacdc379d81022a658b4c3e0802fafcfe9ef7eb0efec3aebae7b422d
-DIST pkgcore-0.7.7.7.tar.bz2 437984 RMD160 d1204551c074d403fb049efac2ae6731934ed8fc SHA1 d746ca4edd84c84ba3b785336a684e0efa0c9d3b SHA256 47273b634f38141b2a6095dc9d62b9153796d1c445d31d4569a06e05dccc56d7
 DIST pkgcore-0.7.7.8.tar.bz2 439499 RMD160 ec9c10e3095f8a529223d98786e4111b7a6e538e SHA1 bcaaea0f920c4ae1caa6cb4cc18a5248a71a31a6 SHA256 ad90b71a1cd2e7aefcab77893396a483cf7c2b9fc08cbcd55711d1985e048116
-EBUILD pkgcore-0.7.7.7-r1.ebuild 1199 RMD160 c5a0743aa181c5c1562634848656cf3854d5be8b SHA1 3fd5373a83525c04c940079126474d68bf8037bf SHA256 f0e73abfd6023c299d4e9d4937ea8c97c60cc097c89eae1672fbeb90c42490ea
 EBUILD pkgcore-0.7.7.8-r1.ebuild 1205 RMD160 db3bf4f2672da6b794758fc93ba44ae1a46f0a4e SHA1 741312dd4c13f4a9c0cabfc99f16e87c1b7b5aff SHA256 ba1f4cd2f020d13eb5557daf4808f6a022fccd1dbfdda32d41d6eb1186029672
+EBUILD pkgcore-0.7.7.8-r2.ebuild 1264 RMD160 00b326f9acfc8ceb61a45a0b0c9d41ac096b4d55 SHA1 5c2611493f289e66cad63cc00da0473e667a4059 SHA256 634ce1558ef1e826d178ed1b37db129f7db408ec00a270e2b3da869f4696d408
 EBUILD pkgcore-0.7.7.8.ebuild 1123 RMD160 961626f383acdf3efd750aed66a75679fe81fe6a SHA1 12dc8730ad023dd34b7b2ef5c0d5d74231ede486 SHA256 88753d0b8804f7960fae0c0cf986478ea1fce6ba292684e34c03211538d57bd8
 EBUILD pkgcore-9999.ebuild 1068 RMD160 bc8a2a0a6bd5bfd833229fdd7f275debbd024d9d SHA1 b7cf48faa047e11876a9bdd7d7959c6265c14ea4 SHA256 5deb75699ba0d4faed469441327f331d9031006ea90084e4a4e5b9afc8842631
-MISC ChangeLog 25825 RMD160 9c1f161cd9e551406186044f3177bcccaa638aa4 SHA1 0a6faeced7893ad5835cdc985caeba2a1e15950f SHA256 7a5e7ea0f6ab3f34a4f39dc8027bc5e5c22beb080e288bb10bdc4ddd8b760747
+MISC ChangeLog 26166 RMD160 aa8a0e1a5e8fe9d0f6be7e956ed631d67b120f2e SHA1 23566792e0ee2d14c4e12c6f39c2770421ded684 SHA256 e7fa43336565d9b3b2d9d9390688823c66f5772b5ee800f4e24f228bc93053a8
 MISC metadata.xml 358 RMD160 86c4bed397308bd927abe5b46b53bef8bb4f4726 SHA1 ef2cdb1191d68aa1f5e10d630a6cdd15b8ea4327 SHA256 9cd29ff0b62fdc004f8a686675df1175b7605ce6ad099d5aa278dfb212aced88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+F3zcACgkQsiLx3HvNzgep3wCfQxolXfZWTDR+GD3NFg/oJppW
-GTkAmgOLOJSD15Zi/lI7vthM5O9MR7ta
-=XJAI
+iEYEARECAAYFAk+5o3IACgkQsiLx3HvNzgdkuACg4Ff5/0AQlFrcBI4UUZ1KRgQZ
+P/8AoK+zqAXl75OrONw9fex3rDIQZgw4
+=tWAh
 -----END PGP SIGNATURE-----
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() {