Fix NameError in 0.7.7.5 that occurs when pkgcore commands have an uncaught

  exception. Additionally, remove old versions in the process.

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

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 6071a6c072f547813b2420874a561119744620b5..319a46d62de2e54dc2ce972c2c9ef7813849d314 100644 (file)
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/pkgcore
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.143 2011/12/26 20:32:06 ferringb Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.144 2012/01/03 14:02:38 ferringb Exp $
+
+*pkgcore-0.7.7.5-r1 (03 Jan 2012)
+
+  03 Jan 2012; Brian Harring <ferringb@gentoo.org> -pkgcore-0.7.5-r2.ebuild,
+  -files/pkgcore-0.7.5-dosym.patch,
+  -files/pkgcore-0.7.5-force-python-binary.patch, -pkgcore-0.7.7.4.ebuild,
+  +pkgcore-0.7.7.5-r1.ebuild, +files/pkgcore-0.7.7.5-NameError.patch:
+  Fix NameError in 0.7.7.5 that occurs when pkgcore commands have an uncaught
+  exception. Additionally, remove old versions in the process.
 
 *pkgcore-0.7.7.5 (26 Dec 2011)
 

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f3ebcfdff2c93d6a103edc7c350ddf45397c1581..fd4a0a326972cb1e7911a04ccfddc5eb62747b2b 100644 (file)
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pkgcore-0.7.5-dosym.patch 1165 RMD160 a5d7bcb6fac18150ecb298d8c2acc34b601af4d7 SHA1 1728cc16c276c7731ede940db98fcd2166265889 SHA256 ecc8923d4d6419c740f6f0ca8d533de949f224767b15fa58beab06006e5e38f1
-AUX pkgcore-0.7.5-force-python-binary.patch 1238 RMD160 dc03e2dca5222268d63f6a63b9bd4ec8ac49f50f SHA1 82e1ecb996020c519bdf8e24077a40e1d98aafa8 SHA256 0186632d3758ee2f625de16b8287042d9c937af274ea56b2f99d83770d7007c4
-DIST pkgcore-0.7.5.tar.bz2 429564 RMD160 08f24ccab29d8e9b319cd1eadc62c3bdf25731e0 SHA1 645dcd292d6cb832671cd7d0884fe33bcfef00a1 SHA256 9d6172ce5eef9c5818946dd52ddc3be61b59e57df227d6d76fb918653ab5daf2
-DIST pkgcore-0.7.7.4.tar.bz2 434479 RMD160 58a6586f43b8e011dfb92929f1f8389a23512db8 SHA1 d66221e9bed08637e2c118c870d79e7e1874e4a4 SHA256 c8bf4f25a5239e6bb9cd026a0f5c31a7f9298fda03de232a31f5c9c5eae8f950
+AUX pkgcore-0.7.7.5-NameError.patch 1193 RMD160 b04e779cf334efda080f76f37a2059b1e3fd017f SHA1 25f3ebb9dc44fed44e9271e9c4f4d123c5efd285 SHA256 7def05a3d5d8bb20797e986f2eb6d132747f36efe46d39b58045dc80e7403735
 DIST pkgcore-0.7.7.5.tar.bz2 437427 RMD160 b84604bd45c3043e25785a3afbe260e2c2d17354 SHA1 35e3b48c1a444504eb014e3ce9ea76c171dc43dc SHA256 2008524f961f588a1826b3aa18079cf65c4af38a357204590f4bcb68bcfa2197
-EBUILD pkgcore-0.7.5-r2.ebuild 1870 RMD160 948037c5bd6ad9e75b4253c11a530bc036ce4862 SHA1 00dcf7567987eab28a1de1f1cd73d52946bbf55f SHA256 ae59abec5f538230e4742873275231fd3a151806f831b009f0cdf7f4b93f2028
-EBUILD pkgcore-0.7.7.4.ebuild 1123 RMD160 4a1a45abf61090022aa3894ead5e143723e0f423 SHA1 d9478247319ae76d8d120ff39fa3ece379ef4808 SHA256 412a8e788b435b63750315d032fa9cb9a9016503a2f7bc0633801427956d870a
+EBUILD pkgcore-0.7.7.5-r1.ebuild 1195 RMD160 fc67af9aa5e3df231c51de8aa906dcdc3ff7ea85 SHA1 c60f7bc9ecb71b777a38bfe167acbbcd54e3c8eb SHA256 913d94328570a12474faa58a5dede0933c08f67af7064957094d019c98a1a56e
 EBUILD pkgcore-0.7.7.5.ebuild 1123 RMD160 f9368da785fa3b46404982a52816539cc0cd27cd SHA1 093fc49b5e3242f3d0ba47dbf9d651fcd83b48a7 SHA256 c6f3bc64bd70ee6d50e14531b308bf0fd6d0afbe58ed7c62e0aa4cf64d6609df
 EBUILD pkgcore-9999.ebuild 1118 RMD160 af13d2dc92adfa82879683868a9bf4e0627ba9c6 SHA1 5600fd931d33cf213dcd7719a7dd4cd7603db016 SHA256 c38e7943f7813a997ebc81039b2f854a9a6630ff687064b523e53ab6f9621c72
-MISC ChangeLog 23912 RMD160 148076de2093310946cee5365a12989c6fc294fe SHA1 cff141bd893c85bef0a2cb0bccf21ead0a30b7cf SHA256 302422845b7a886ae997087b95399147cc4f70b6d39d02c899f2146d66fe2c37
+MISC ChangeLog 24347 RMD160 8afffdaf934794d7dbdd751d40991727c2961206 SHA1 617eeca7cc7487e32329e0b3107b8baf5325cd0b SHA256 180f1d290d20e5547fba1ae8ed0d63e36008adbdb976654d2f1fe47a2503a49e
 MISC metadata.xml 234 RMD160 7f7e4ec7da60203d4fc0d59ea9b7001ca84fd88c SHA1 fc54601f1382d43dd16625b242d7a52ff36f3782 SHA256 f036ed153de912a1bb1466478e9ce0c9d4ecae55929f6b13490c3f47a242fc0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk742cwACgkQsiLx3HvNzgdLggCeKzBv5Sg3WKMe57pvpjyr46dm
-/f0AoMC6O9jhZFR1Nld6vSsg9jhRiHxy
-=a3NI
+iEYEARECAAYFAk8DCoMACgkQsiLx3HvNzgdbFQCgiJk5EO2cW4nIdFvNdQ91U/pp
+6AcAnjxB3f9jI9Kp/VG3xUwWdjEskWa5
+=YDJy
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch b/sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch
deleted file mode 100644 (file)
index 3f58967..0000000
--- a/sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 87e10f2a3b5d9867c104ffb4ed023bff0a64f218 Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Thu, 17 Nov 2011 16:27:30 -0800
-Subject: [PATCH] allow dosym some-file directory/ despite PMS
-
-This conflicts with PMS (gentoo bug 379899), but neither the usage nor
-spec is being corrected to rectify it.  Rather than break things for
-users, we now allow it.
----
- pkgcore/ebuild/eapi-bash/helpers/common/dohard |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/pkgcore/ebuild/eapi-bash/helpers/common/dohard b/pkgcore/ebuild/eapi-bash/helpers/common/dohard
-index 13ebeda..d00946f 100755
---- a/pkgcore/ebuild/eapi-bash/helpers/common/dohard
-+++ b/pkgcore/ebuild/eapi-bash/helpers/common/dohard
-@@ -8,9 +8,10 @@ check_args 2
- ln_option=
- src_prefix=
- if [[ ${HELPER_NAME} == dosym ]]; then
--      # T while nonportable, is to ensure that if there is a directory
--      # conflict, it doesn't just create the sym w/in
--      ln_option=snT
-+      ln_option=sn
-+      if [[ ${2} == */ ]] || [[ -d $2 && ! -L $2 ]]; then
-+              echo "QA: dosym target '$2' omits the filename target; see bug 379899" >&2
-+      fi
- else
-       src_prefix="${D}"
- fi
--- 
-1.7.8.rc1
-

diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.5-force-python-binary.patch b/sys-apps/pkgcore/files/pkgcore-0.7.5-force-python-binary.patch
deleted file mode 100644 (file)
index 625d0d4..0000000
--- a/sys-apps/pkgcore/files/pkgcore-0.7.5-force-python-binary.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d0320842a1b749612b3cdb6f30617760c29ced75 Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Wed, 9 Nov 2011 15:28:32 -0800
-Subject: [PATCH] force python binary used for pinspect calls.
-
----
- .../ebuild/eapi-bash/ebuild-default-functions.lib  |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib b/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib
-index 3ee5e99..cff5405 100644
---- a/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib
-+++ b/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib
-@@ -13,8 +13,9 @@ portageq() {
-       # being snagged by the sandbox
-       local portageq_str=portageq
-       ${PKGCORE_DISABLE_COMPAT-false} && portageq_str=query
--      SANDBOX_on=0 PYTHONPATH="$PKGCORE_PYTHONPATH" "${PKGCORE_BIN_PATH}/pinspect" ${portageq_str} "${command}" \
--          --eapi "${EAPI:--1}" --use "${USE}" "$@"
-+      SANDBOX_on=0 PYTHONPATH="$PKGCORE_PYTHONPATH" "${PKGCORE_PYTHON_BINARY}" \
-+              "${PKGCORE_BIN_PATH}/pinspect" ${portageq_str} "${command}" \
-+                      --eapi "${EAPI:--1}" --use "${USE}" "$@"
-       local ret="$?"
-       [ "$ret" == 127 ] && die "pinspect couldn't be found; broken pkgcore installation?"
-       return $(( $ret ))
--- 
-1.7.8.rc1
-

diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.7.5-NameError.patch b/sys-apps/pkgcore/files/pkgcore-0.7.7.5-NameError.patch
new file mode 100644 (file)
index 0000000..fe163be
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.7.7.5-NameError.patch
@@ -0,0 +1,33 @@
+From 4b56e8e31c301840ac8734b601d868a9b4ca42ba Mon Sep 17 00:00:00 2001
+From: Brian Harring <ferringb@gmail.com>
+Date: Mon, 2 Jan 2012 13:01:07 -0800
+Subject: [PATCH] fix NameError's w/in the error pathway
+
+---
+ pkgcore/util/commandline.py |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/pkgcore/util/commandline.py b/pkgcore/util/commandline.py
+index 02330b4..8a409aa 100644
+--- a/pkgcore/util/commandline.py
++++ b/pkgcore/util/commandline.py
+@@ -807,12 +807,14 @@ def main(subcommands, args=None, outfile=None, errfile=None,
+             tb = None
+         dump_error(errfile, e, "Error in configuration", tb=tb)
+     except operations.OperationError, e:
+-        exc = sys.exc_info()[-1]
++        tb = sys.exc_info()[-1]
+         if not getattr(options, 'debug', False):
+             tb = None
+         dump_error(errfile, e, "Error running an operation", tb=tb)
+     except Exception, e:
+-        exc = sys.exc_info()[-1]
++        tb = sys.exc_info()[-1]
++        if not getattr(options, 'debug', False):
++            tb = None
+         dump_error(errfile, e, "Unhandled Exception occured", tb=tb)
+     if out is not None:
+         if exitstatus:
+-- 
+1.7.8.2
+

diff --git a/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild
deleted file mode 100644 (file)
index 3e834b9..0000000
--- a/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild,v 1.1 2011/11/18 04:04:58 ferringb Exp $
-
-EAPI="3"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-DESCRIPTION="pkgcore package manager"
-HOMEPAGE="http://pkgcore.googlecode.com/"
-SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="-doc build"
-
-RDEPEND=">=dev-lang/python-2.4
-       >=dev-python/snakeoil-0.4.4
-       || ( >=dev-lang/python-2.5 dev-python/pycrypto )"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx dev-python/pyparsing )"
-
-DOCS="AUTHORS NEWS"
-
-pkg_setup() {
-       # disable snakeoil 2to3 caching...
-       unset PY2TO3_CACHEDIR
-       python_pkg_setup
-}
-
-src_prepare() {
-       epatch "$FILESDIR/"$PN-$PV-force-python-binary.patch
-       epatch "$FILESDIR/"$PN-$PV-dosym.patch
-}
-
-src_compile() {
-       distutils_src_compile
-
-       if use doc; then
-               python setup.py build_docs || die "doc building failed"
-       fi
-}
-
-src_install() {
-       distutils_src_install
-
-       if use doc; then
-               dohtml -r build/sphinx/html/*
-       fi
-}
-
-pkg_postinst() {
-       distutils_pkg_postinst
-       pplugincache
-
-       if [[ -d "${ROOT}etc/pkgcore/plugins" ]]; then
-               elog "You still have an /etc/pkgcore/plugins from pkgcore 0.1."
-               elog "It is unused by pkgcore >= 0.2, remove it now."
-               die "remove /etc/pkgcore/plugins from pkgcore 0.1"
-       fi
-
-       # This is left behind by pkgcore 0.2.
-       rm -f "${ROOT}"$(python_get_sitedir)/pkgcore/plugins/plugincache
-}
-
-pkg_postrm() {
-       # Careful not to remove this on up/downgrades.
-       local sitep="${ROOT}"$(python_get_sitedir)/site-packages
-       if [[ -e "${sitep}/pkgcore/plugins/plugincache2" ]] &&
-               ! [[ -e "${sitep}/pkgcore/plugin.py" ]]; then
-               rm "${sitep}/pkgcore/plugins/plugincache2"
-       fi
-       distutils_pkg_postrm
-}

diff --git a/sys-apps/pkgcore/pkgcore-0.7.7.4.ebuild b/sys-apps/pkgcore/pkgcore-0.7.7.5-r1.ebuild
similarity index 86%
rename from sys-apps/pkgcore/pkgcore-0.7.7.4.ebuild
rename to sys-apps/pkgcore/pkgcore-0.7.7.5-r1.ebuild
index fc5daf4137d0b38d241b1b0f067bfd7122071ba6..2bbab9c55412d519f596247f765e6bafe1d8c3d0 100644 (file)
--- a/sys-apps/pkgcore/pkgcore-0.7.7.4.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.7.7.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4.ebuild,v 1.1 2011/12/15 00:51:52 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.5-r1.ebuild,v 1.1 2012/01/03 14:02:38 ferringb Exp $
 
 EAPI="3"
 DISTUTILS_SRC_TEST="setup.py"
@@ -30,6 +30,10 @@ pkg_setup() {
        python_pkg_setup
 }
 
+src_prepare() {
+       epatch "${FILESDIR}/"${PN}-${PV}-NameError.patch
+}
+
 src_compile() {
        distutils_src_compile