diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2015-10-22 22:56:30 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2015-10-23 09:05:18 -0700 |
| commit | aca25ac8ceb854713057c75c40d1a96fa764ca79 (patch) | |
| tree | 83c5919231f296152db695c133bf9b7905dfc89a | |
| parent | calc_depclean: fix AttributeError for SonameAtom.unevaluated_atom (bug 563740) (diff) | |
| download | portage-aca25ac8ceb854713057c75c40d1a96fa764ca79.tar.gz portage-aca25ac8ceb854713057c75c40d1a96fa764ca79.tar.bz2 portage-aca25ac8ceb854713057c75c40d1a96fa764ca79.zip | |
calc_depclean: do not abort for broken soname dependencies (bug 563844)
X-Gentoo-Bug: 563844
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563844
Acked-by: Alexander Berntsen <bernalex@gentoo.org>
| -rw-r--r-- | pym/_emerge/actions.py | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 602715bc3..7f1cb5921 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -863,11 +863,31 @@ def calc_depclean(settings, trees, ldpath_mtimes, def unresolved_deps(): + soname_deps = set() unresolvable = set() for dep in resolver._dynamic_config._initially_unsatisfied_deps: if isinstance(dep.parent, Package) and \ (dep.priority > UnmergeDepPriority.SOFT): - unresolvable.add((dep.atom, dep.parent.cpv)) + if dep.atom.soname: + soname_deps.add((dep.atom, dep.parent.cpv)) + else: + unresolvable.add((dep.atom, dep.parent.cpv)) + + if soname_deps: + # Generally, broken soname dependencies can safely be + # suppressed by a REQUIRES_EXCLUDE setting in the ebuild, + # so they should only trigger a warning message. + prefix = warn(" * ") + msg = [] + msg.append("Broken soname dependencies found:") + msg.append("") + for atom, parent in soname_deps: + msg.append(" %s required by:" % (atom,)) + msg.append(" %s" % (parent,)) + msg.append("") + + writemsg_level("".join("%s%s\n" % (prefix, line) for line in msg), + level=logging.WARNING, noiselevel=-1) if not unresolvable: return False |