From d0d939778dc6219c5888bdd18ec68d87e55b69b5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 14 Jun 2007 10:46:31 +0000 Subject: Fix broken \!found logic so that any missing files are properly skipped. svn path=/main/trunk/; revision=6843 --- pym/portage/dbapi/vartree.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'pym') diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index f7a9defce..2d3f44283 100644 --- 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 -- cgit v1.2.3-1-g7c22