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 1SiX7x-0000Gz-Gs for garchives@archives.gentoo.org; Sat, 23 Jun 2012 20:40:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56C5221C063; Sat, 23 Jun 2012 20:39:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2B96521C063 for ; Sat, 23 Jun 2012 20:39:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E7BF1B4031 for ; Sat, 23 Jun 2012 20:39:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 51333E5436 for ; Sat, 23 Jun 2012 20:39:38 +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: <1340483967.e0fa8f389867d78438451ed4a8b1af1ea89b65b6.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: e0fa8f389867d78438451ed4a8b1af1ea89b65b6 X-VCS-Branch: master Date: Sat, 23 Jun 2012 20:39:38 +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: bef2661d-bfa8-4dde-9d47-fa583ee619d4 X-Archives-Hash: 6a935d9a422789fd535bfcba8e59be03 commit: e0fa8f389867d78438451ed4a8b1af1ea89b65b6 Author: Zac Medico gentoo org> AuthorDate: Sat Jun 23 20:39:27 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 23 20:39:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De0fa8f38 Skip unmerge of libdir symlinks for bug #423127. --- pym/portage/dbapi/vartree.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index e2b1b9b..020240d 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2181,6 +2181,12 @@ class dblink(object): ignore =3D True break =20 + if not ignore: + if islink and f_match in \ + ("/lib", "/usr/lib", "/usr/local/lib"): + # Ignore libdir symlinks for bug #423127. + ignore =3D True + if ignore: show_unmerge("---", unmerge_desc["cfgpro"], file_type, obj) continue