| commit | e0fa8f389867d78438451ed4a8b1af1ea89b65b6 | [log] [tgz] |
|---|---|---|
| author | Zac Medico <zmedico@gentoo.org> | Sat Jun 23 13:39:27 2012 -0700 |
| committer | Zac Medico <zmedico@gentoo.org> | Sat Jun 23 13:39:27 2012 -0700 |
| tree | 7fc0ad4bebb010e7cea8b36515dd46480f83f9a2 | |
| parent | fc371676a0eb555321a77207321bdeab6e746c87 [diff] |
Skip unmerge of libdir symlinks for bug #423127.
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 @@ 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