From 7952a52ad798e5e6130d739501683b6df236a5e4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 15 Jun 2007 22:53:05 +0000 Subject: Go ahead and unlink symlinks to directories when they're actually recorded as symlinks in the contents. svn path=/main/trunk/; revision=6860 --- pym/portage/dbapi/vartree.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'pym') diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 5affc5f07..ee134547b 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1224,11 +1224,13 @@ class dblink(object): 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)) -- cgit v1.2.3-1-g7c22