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 1QMZSt-0005mM-Hk for garchives@archives.gentoo.org; Wed, 18 May 2011 05:38:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C69C91C0A5; Wed, 18 May 2011 05:38:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8E0371C0A5 for ; Wed, 18 May 2011 05:38:26 +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 23B3F1B4030 for ; Wed, 18 May 2011 05:38:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8FEED54EBD for ; Wed, 18 May 2011 05:38:25 +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: <2dec6268b2114a147e10503d6ddc4713443a2f99.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master 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: 2dec6268b2114a147e10503d6ddc4713443a2f99 Date: Wed, 18 May 2011 05:38:25 +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: 12a46176c176f8aa2966192587732fd4 commit: 2dec6268b2114a147e10503d6ddc4713443a2f99 Author: Zac Medico gentoo org> AuthorDate: Wed May 18 05:38:07 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 18 05:38:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D2dec6268 _find_libs_to_preserve: always return set --- pym/portage/dbapi/vartree.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index fd5c774..cd93a12 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2350,7 +2350,7 @@ class dblink(object): self.vartree.dbapi._plib_registry is None or \ (not unmerge and self._installed_instance is None) or \ "preserve-libs" not in self.settings.features: - return None + return set() =20 os =3D _os_merge linkmap =3D self.vartree.dbapi._linkmap