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 1QFYRL-00069h-F4 for garchives@archives.gentoo.org; Thu, 28 Apr 2011 21:08:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E130E01A3; Thu, 28 Apr 2011 21:07:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0AD77E01A3 for ; Thu, 28 Apr 2011 21:07:49 +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 700991B4052 for ; Thu, 28 Apr 2011 21:07:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A977780505 for ; Thu, 28 Apr 2011 21:07:48 +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: <593b57110c6f441d03d9ae623de9ff99a2e57905.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 593b57110c6f441d03d9ae623de9ff99a2e57905 Date: Thu, 28 Apr 2011 21:07:48 +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: 9f72f7175bfa13a88e197528e71dca55 commit: 593b57110c6f441d03d9ae623de9ff99a2e57905 Author: Zac Medico gentoo org> AuthorDate: Thu Apr 28 21:07:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Apr 28 21:07:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D593b5711 display_preserved_libs: load plib_registry Since commit 7535cabdf2fab76fc55df83643157613dfd66be9, the plib_registry is modified in a subprocess, and the parent process' copy can become stale because of this. Therefore, explicitly load it. --- pym/_emerge/main.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 82b1444..e0cd0c0 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -217,7 +217,9 @@ def display_preserved_libs(vardbapi, myopts): # preserve-libs is entirely disabled return =20 - # Ensure the registry is consistent with existing files. + # Explicitly load and prune the PreservedLibsRegistry in order + # to ensure that we do not display stale data. + vardbapi._plib_registry.load() vardbapi._plib_registry.pruneNonExisting() =20 if vardbapi._plib_registry.hasEntries():