[patch] Proposed way to deal with unmerge-orphans. (not tested)

simplify_unmerge_orphans.patch (text/plain), 1.09 KB, created by Andrey on 2009-09-14 15:06:11 UTC

Index: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py	(revision 14273)
+++ main/trunk/pym/portage/dbapi/vartree.py	(working copy)
@@ -2462,21 +2462,8 @@
 
 				# 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:
-						unlink(obj, lstatobj)
-					except EnvironmentError, e:
-						if e.errno not in ignored_unlink_errnos:
-							raise
-						del e
-					show_unmerge("<<<", "", file_type, obj)
-					continue
-
 				lmtime = str(lstatobj[stat.ST_MTIME])
-				if (pkgfiles[objkey][0] not in ("dir", "fif", "dev")) and (lmtime != pkgfiles[objkey][1]):
+				if not unmerge_orphans and (pkgfiles[objkey][0] not in ("dir", "fif", "dev")) and (lmtime != pkgfiles[objkey][1]):
 					show_unmerge("---", unmerge_desc["!mtime"], file_type, obj)
 					continue