diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-29 13:16:34 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-29 13:16:34 -0700 |
| commit | 38ab9edcb86df7c2ab057013e40c7389c6c51b70 (patch) | |
| tree | a4005c35eaecb06293beeae99da32f4cd5d7cd78 | |
| parent | bca981ba89773059498c44e68896785160b010a4 (diff) | |
| download | portage-38ab9edcb86df7c2ab057013e40c7389c6c51b70.tar.gz portage-38ab9edcb86df7c2ab057013e40c7389c6c51b70.tar.bz2 portage-38ab9edcb86df7c2ab057013e40c7389c6c51b70.zip | |
unmerge: fix false alarm about protected symlinksv2.2.0_alpha49
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.
| -rw-r--r-- | 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 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 |