projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc37167
)
Skip unmerge of libdir symlinks for bug #423127.
v2.2.0_alpha112
author
Zac Medico
<zmedico@gentoo.org>
Sat, 23 Jun 2012 20:39:27 +0000
(13:39 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Sat, 23 Jun 2012 20:39:27 +0000
(13:39 -0700)
pym/portage/dbapi/vartree.py
patch
|
blob
|
history
diff --git
a/pym/portage/dbapi/vartree.py
b/pym/portage/dbapi/vartree.py
index e2b1b9bb270884a6e9c1b742247ce2521238ebf0..020240d613b6f48dcde36af4e141ce611a346b12 100644
(file)
--- 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