Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 384140 Details for
Bug 520950
dev-java/icedtea-web-1.3.2-r7 ebuild incorrectly treated as masked and with no reason of masking
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
depgraph._add_dep: fix bug #520950
depgraph._add_dep-fix-bug-520950.patch (text/plain), 3.78 KB, created by
Zac Medico
on 2014-09-02 23:34:41 UTC
(
hide
)
Description:
depgraph._add_dep: fix bug #520950
Filename:
MIME Type:
Creator:
Zac Medico
Created:
2014-09-02 23:34:41 UTC
Size:
3.78 KB
patch
obsolete
>From 89dd14404c2bb54ecc6c5e0906a2bb9dadf6352b Mon Sep 17 00:00:00 2001 >From: Zac Medico <zmedico@gentoo.org> >Date: Tue, 2 Sep 2014 15:34:16 -0700 >Subject: [PATCH] depgraph._add_dep: fix bug #520950 > >This handles a case which occurs when >_solve_non_slot_operator_slot_conflicts calls _create_graph. In this >case, ignore unsatisfied deps for installed packages only if their depth >is beyond the depth requested by the user and the dep was initially >unsatisfied (not broken by a slot conflict in the current graph). > >X-Gentoo-Bug: 520950 >X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=520950 >--- > pym/_emerge/depgraph.py | 32 ++++++++++++++++++++++++++++---- > 1 file changed, 28 insertions(+), 4 deletions(-) > >diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py >index d6cd24d..96338d1 100644 >--- a/pym/_emerge/depgraph.py >+++ b/pym/_emerge/depgraph.py >@@ -107,7 +107,7 @@ def _wildcard_set(atoms): > > class _frozen_depgraph_config(object): > >- def __init__(self, settings, trees, myopts, spinner): >+ def __init__(self, settings, trees, myopts, params, spinner): > self.settings = settings > self.target_root = settings["EROOT"] > self.myopts = myopts >@@ -115,6 +115,7 @@ class _frozen_depgraph_config(object): > if settings.get("PORTAGE_DEBUG", "") == "1": > self.edebug = 1 > self.spinner = spinner >+ self.requested_depth = params.get("deep", 0) > self._running_root = trees[trees._running_eroot]["root_config"] > self.pkgsettings = {} > self.trees = {} >@@ -508,7 +509,7 @@ class depgraph(object): > frozen_config=None, backtrack_parameters=BacktrackParameter(), allow_backtracking=False): > if frozen_config is None: > frozen_config = _frozen_depgraph_config(settings, trees, >- myopts, spinner) >+ myopts, myparams, spinner) > self._frozen_config = frozen_config > self._dynamic_config = _dynamic_depgraph_config(self, myparams, > allow_backtracking, backtrack_parameters) >@@ -2167,6 +2168,29 @@ class depgraph(object): > if allow_unsatisfied: > self._dynamic_config._unsatisfied_deps.append(dep) > return 1 >+ >+ # The following case occurs when >+ # _solve_non_slot_operator_slot_conflicts calls >+ # _create_graph. In this case, ignore unsatisfied deps for >+ # installed packages only if their depth is beyond the depth >+ # requested by the user and the dep was initially >+ # unsatisfied (not broken by a slot conflict in the current >+ # graph). See bug #520950. >+ # NOTE: This currently does not apply to removal actions, >+ # since all existing removal actions traverse all installed >+ # deps deeply via the _complete_graph method. >+ if ("remove" not in self._dynamic_config.myparams and >+ self._dynamic_config._complete_mode and >+ isinstance(dep.parent, Package) and >+ dep.parent.installed and >+ self._frozen_config.requested_depth is not True and >+ dep.parent.depth >= self._frozen_config.requested_depth): >+ inst_pkg, in_graph = \ >+ self._select_pkg_from_installed(dep.root, dep.atom) >+ if inst_pkg is None: >+ self._dynamic_config._initially_unsatisfied_deps.append(dep) >+ return 1 >+ > self._dynamic_config._unsatisfied_deps_for_display.append( > ((dep.root, dep.atom), {"myparent":dep.parent})) > >@@ -8487,7 +8511,7 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp > backtracked = 0 > > frozen_config = _frozen_depgraph_config(settings, trees, >- myopts, spinner) >+ myopts, myparams, spinner) > > while backtracker: > >@@ -8569,7 +8593,7 @@ def _resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner): > mergelist = mtimedb["resume"]["mergelist"] > dropped_tasks = {} > frozen_config = _frozen_depgraph_config(settings, trees, >- myopts, spinner) >+ myopts, myparams, spinner) > while True: > mydepgraph = depgraph(settings, trees, > myopts, myparams, spinner, frozen_config=frozen_config) >-- >1.8.1.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 520950
:
384126
|
384138
|
384140
|
384162
|
384164
|
384180
|
384202
|
384316
|
384318