From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PuXX2-0001o8-9I for garchives@archives.gentoo.org; Tue, 01 Mar 2011 21:55:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7120D1C03B; Tue, 1 Mar 2011 21:54:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3CB951C03B for ; Tue, 1 Mar 2011 21:54:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEFD12AC131 for ; Tue, 1 Mar 2011 21:54:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2C3858006A for ; Tue, 1 Mar 2011 21:54:52 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <99e88f2d30761fa7c72660a97da1f516f1075256.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 99e88f2d30761fa7c72660a97da1f516f1075256 Date: Tue, 1 Mar 2011 21:54:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5df4e3826bf61eae7a13007a140219f3 commit: 99e88f2d30761fa7c72660a97da1f516f1075256 Author: Zac Medico gentoo org> AuthorDate: Tue Mar 1 21:20:59 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 1 21:54:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D99e88f2d unmerge: log pre/postrm FAILED messages --- pym/portage/dbapi/vartree.py | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index fdfbc77..3bc30af 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1518,6 +1518,7 @@ class dblink(object): # Now, don't assume that the name of the ebuild is the same as the # name of the dir; the package may have been moved. myebuildpath =3D None + failures =3D 0 ebuild_phase =3D "prerm" log_path =3D None mystuff =3D os.listdir(self.dbdir) @@ -1537,16 +1538,18 @@ class dblink(object): doebuild_environment(myebuildpath, "prerm", settings=3Dself.settings, db=3Dself.vartree.dbapi) except UnsupportedAPIException as e: + failures +=3D 1 # Sometimes this happens due to corruption of the EAPI file. - writemsg(_("!!! FAILED prerm: %s\n") % \ - os.path.join(self.dbdir, "EAPI"), noiselevel=3D-1) - writemsg("%s\n" % str(e), noiselevel=3D-1) + showMessage(_("!!! FAILED prerm: %s\n") % \ + os.path.join(self.dbdir, "EAPI"), + level=3Dlogging.ERROR, noiselevel=3D-1) + showMessage("%s\n" % (e,), + level=3Dlogging.ERROR, noiselevel=3D-1) myebuildpath =3D None =20 builddir_lock =3D None scheduler =3D self._scheduler retval =3D os.EX_OK - failures =3D 0 try: if myebuildpath: builddir_lock =3D EbuildBuildDir( @@ -1566,7 +1569,8 @@ class dblink(object): # XXX: Decide how to handle failures here. if retval !=3D os.EX_OK: failures +=3D 1 - writemsg(_("!!! FAILED prerm: %s\n") % retval, noiselevel=3D-1) + showMessage(_("!!! FAILED prerm: %s\n") % retval, + level=3Dlogging.ERROR, noiselevel=3D-1) =20 self._unmerge_pkgfiles(pkgfiles, others_in_slot) self._clear_contents_cache() @@ -1591,7 +1595,8 @@ class dblink(object): # XXX: Decide how to handle failures here. if retval !=3D os.EX_OK: failures +=3D 1 - writemsg(_("!!! FAILED postrm: %s\n") % retval, noiselevel=3D-1) + showMessage(_("!!! FAILED postrm: %s\n") % retval, + level=3Dlogging.ERROR, noiselevel=3D-1) =20 # Skip this if another package in the same slot has just been # merged on top of this package, since the other package has