From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 29 Jul 2011 20:16:34 +0000 (-0700)
Subject: unmerge: fix false alarm about protected symlinks
X-Git-Tag: v2.2.0_alpha49
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=38ab9edcb86df7c2ab057013e40c7389c6c51b70;p=portage.git

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.
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e85e0b85a..6317af756 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2030,7 +2030,7 @@ class dblink(object):
 							is_owned = True
 							break
 
-					if is_owned and \
+					if file_type == "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