Fix broken \!found logic so that any missing files are properly skipped.

svn path=/main/trunk/; revision=6843

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index f7a9defce9422c7423b3cb620b995418644d03dd..2d3f4428365ec492aa0cd0004ce5cd620f917073 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1181,12 +1181,8 @@ class dblink(object):
                                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