aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-06-23 20:39:27 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-06-23 20:39:27 (GMT)
commite0fa8f389867d78438451ed4a8b1af1ea89b65b6 (patch)
tree7fc0ad4bebb010e7cea8b36515dd46480f83f9a2
parentFix debug message wording of "to due". (diff)
downloadportage-e0fa8f389867d78438451ed4a8b1af1ea89b65b6.zip
portage-e0fa8f389867d78438451ed4a8b1af1ea89b65b6.tar.gz
portage-e0fa8f389867d78438451ed4a8b1af1ea89b65b6.tar.bz2
Skip unmerge of libdir symlinks for bug #423127.v2.2.0_alpha112
-rw-r--r--pym/portage/dbapi/vartree.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e2b1b9b..020240d 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2181,6 +2181,12 @@ class dblink(object):
ignore = True
break
+ if not ignore:
+ if islink and f_match in \
+ ("/lib", "/usr/lib", "/usr/local/lib"):
+ # Ignore libdir symlinks for bug #423127.
+ ignore = True
+
if ignore:
show_unmerge("---", unmerge_desc["cfgpro"], file_type, obj)
continue