During unmerge, always verify that the file isn't a symlink before doing chmod.

svn path=/main/trunk/; revision=6867

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index dcc673c796ff6ff472480fcbef7e4d38ab4cd9b1..68545a53b3ca44fb627e50bf9d75d47f076ba2b1 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1263,7 +1263,8 @@ class dblink(object):
                                        try:
                                                # Remove permissions to ensure that any hardlinks to
                                                # suid/sgid files are rendered harmless.
-                                               os.chmod(obj, 0)
+                                               if not islink:
+                                                       os.chmod(obj, 0)
                                                os.unlink(obj)
                                        except (OSError, IOError), e:
                                                pass