Go ahead and unlink symlinks to directories when they're actually recorded as symlink...

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

diff --git a/pym/portage.py b/pym/portage.py
index fce0c27e392335ce3382391ada79222aa12b25a5..09554e935505ce4549c970f521ff73b96368634a 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7189,11 +7189,13 @@ class dblink:
                                        if not islink:
                                                writemsg_stdout("--- !sym   %s %s\n" % ("sym", obj))
                                                continue
-                                       # Don't unlink symlinks to directories here since that can
-                                       # remove /lib and /usr/lib symlinks.
-                                       if statobj and stat.S_ISDIR(statobj.st_mode):
-                                               writemsg_stdout("--- !sym   %s %s\n" % ("sym", obj))
-                                               continue
+                                       # Go ahead and unlink symlinks to directories here when
+                                       # they're actually recorded as symlinks in the contents.
+                                       # Normally, symlinks such as /lib -> lib64 are not recorded
+                                       # as symlinks in the contents of a package.  If a package
+                                       # installs something into ${D}/lib/, it is recorded in the
+                                       # contents as a directory even if it happens to correspond
+                                       # to a symlink when it's merged to the live filesystem.
                                        try:
                                                os.unlink(obj)
                                                writemsg_stdout("<<<        %s %s\n" % ("sym",obj))