From def36a667c634e9e16e9938b566f33aa979a5fae Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 15 Jun 2007 20:26:26 +0000 Subject: For bug #182157, don't let unmerge-orphans unlink symlinks to directories since that can remove /lib and /usr/lib symlinks. svn path=/main/branches/2.1.2/; revision=6851 --- pym/portage.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index 88bc3816c..dc8b3d842 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -7158,8 +7158,11 @@ class dblink: writemsg_stdout("--- cfgpro %s %s\n" % (pkgfiles[objkey][0], obj)) continue + # Don't unlink symlinks to directories here since that can + # remove /lib and /usr/lib symlinks. if unmerge_orphans and \ lstatobj and not stat.S_ISDIR(lstatobj.st_mode) and \ + not (islink and statobj and stat.S_ISDIR(statobj.st_mode)) and \ not self.isprotected(obj): try: # Remove permissions to ensure that any hardlinks to -- cgit v1.2.3-1-g7c22