From eb2f4620e799b0f60094b53bcfb1e1884a4b6f5c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 14 Jun 2007 10:47:53 +0000 Subject: Fix broken \!found logic so that any missing files are properly skipped. (trunk r6843) svn path=/main/branches/2.1.2/; revision=6844 --- pym/portage.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index b170a7bc4..54eb19a13 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -7146,12 +7146,8 @@ class dblink: except (OSError, AttributeError): pass islink = lstatobj is not None and stat.S_ISLNK(lstatobj.st_mode) - if not unmerge_orphans and statobj is None: - if not islink: - #we skip this if we're dealing with a symlink - #because os.stat() will operate on the - #link target rather than the link itself. - writemsg_stdout("--- !found "+str(pkgfiles[objkey][0])+ " %s\n" % obj) + if lstatobj is None: + writemsg_stdout("--- !found %s %s\n" % (file_type, obj)) continue # next line includes a tweak to protect modules from being unmerged, # but we don't protect modules from being overwritten if they are -- cgit v1.2.3-1-g7c22