diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-06-14 10:47:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-14 10:47:53 +0000 |
| commit | eb2f4620e799b0f60094b53bcfb1e1884a4b6f5c (patch) | |
| tree | f7542a8324acb42d07c7d73f26eed2c51805c3ee | |
| parent | Miscellaneous global updates cleanups. (trunk r6686, r6688, and r6690:6693) (diff) | |
| download | portage-multirepo-2.1.3_rc1.tar.gz portage-multirepo-2.1.3_rc1.tar.bz2 portage-multirepo-2.1.3_rc1.zip | |
Fix broken \!found logic so that any missing files are properly skipped. (trunk r6843)v2.1.3_rc1
svn path=/main/branches/2.1.2/; revision=6844
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pym/portage.py b/pym/portage.py index b170a7bc..54eb19a1 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 |