Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 240656 | Differences between
and this patch

Collapse All | Expand All

(-)main/trunk/pym/portage/dbapi/vartree.py (-14 / +1 lines)
Lines 2462-2482 Link Here
2462
2462
2463
				# Don't unlink symlinks to directories here since that can
2463
				# Don't unlink symlinks to directories here since that can
2464
				# remove /lib and /usr/lib symlinks.
2464
				# remove /lib and /usr/lib symlinks.
2465
				if unmerge_orphans and \
2466
					lstatobj and not stat.S_ISDIR(lstatobj.st_mode) and \
2467
					not (islink and statobj and stat.S_ISDIR(statobj.st_mode)) and \
2468
					not self.isprotected(obj):
2469
					try:
2470
						unlink(obj, lstatobj)
2471
					except EnvironmentError, e:
2472
						if e.errno not in ignored_unlink_errnos:
2473
							raise
2474
						del e
2475
					show_unmerge("<<<", "", file_type, obj)
2476
					continue
2477
2478
				lmtime = str(lstatobj[stat.ST_MTIME])
2465
				lmtime = str(lstatobj[stat.ST_MTIME])
2479
				if (pkgfiles[objkey][0] not in ("dir", "fif", "dev")) and (lmtime != pkgfiles[objkey][1]):
2466
				if not unmerge_orphans and (pkgfiles[objkey][0] not in ("dir", "fif", "dev")) and (lmtime != pkgfiles[objkey][1]):
2480
					show_unmerge("---", unmerge_desc["!mtime"], file_type, obj)
2467
					show_unmerge("---", unmerge_desc["!mtime"], file_type, obj)
2481
					continue
2468
					continue
2482
2469

Return to bug 240656