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

svn path=/main/branches/2.1.2/; revision=6868

diff --git a/pym/portage.py b/pym/portage.py
index 955901a52f32270adecff88c5ba8c7a317301f72..bbbc6312b3d972d1c16dc66f97d33c515fd706ab 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7228,7 +7228,8 @@ class dblink:
                                        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