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 <gentoo-commits+bounces-367234-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Qmtes-00073K-Dj for garchives@archives.gentoo.org; Fri, 29 Jul 2011 20:27:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E08A21C14D; Fri, 29 Jul 2011 20:27:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ED0BB21C14D for <gentoo-commits@lists.gentoo.org>; Fri, 29 Jul 2011 20:27:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 632A11B4015 for <gentoo-commits@lists.gentoo.org>; Fri, 29 Jul 2011 20:27:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C1D318003D for <gentoo-commits@lists.gentoo.org>; Fri, 29 Jul 2011 20:27:36 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <38ab9edcb86df7c2ab057013e40c7389c6c51b70.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: 38ab9edcb86df7c2ab057013e40c7389c6c51b70 Date: Fri, 29 Jul 2011 20:27:36 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1e836b74f726212565bec741f21bc400 commit: 38ab9edcb86df7c2ab057013e40c7389c6c51b70 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Jul 29 20:16:34 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Jul 29 20:16:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D38ab9edc unmerge: fix false alarm about protected symlinks The error message about preserved symlinks, from commit 4bb08136f073024c5d31dceb1618b6f4e7246369, should only be triggered in cases when the package being unmerged has the given path listed as a symlink in its CONTENTS. --- 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 e85e0b8..6317af7 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2030,7 +2030,7 @@ class dblink(object): is_owned =3D True break =20 - if is_owned and \ + if file_type =3D=3D "sym" and is_owned and \ (islink and statobj and stat.S_ISDIR(statobj.st_mode)): # A new instance of this package claims the file, so # don't unmerge it. If the file is symlink to a