| 1 |
commit: af430c8b439cf67079b54fa3b18312e0a6afce8d |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 4 17:20:58 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 4 17:20:58 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=af430c8b |
| 7 |
|
| 8 |
add_pkg_dep_string: respect traverse_ignored_deps |
| 9 |
|
| 10 |
I don't think this makes any difference now, but it clarifies how |
| 11 |
traverse_ignored_deps should behave. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/_emerge/depgraph.py | 9 ++++++--- |
| 15 |
1 files changed, 6 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 18 |
index ebfbdd4..9dcc5b9 100644 |
| 19 |
--- a/pym/_emerge/depgraph.py |
| 20 |
+++ b/pym/_emerge/depgraph.py |
| 21 |
@@ -1543,7 +1543,8 @@ class depgraph(object): |
| 22 |
self._dynamic_config._ignored_deps.append(dep) |
| 23 |
|
| 24 |
if not ignored: |
| 25 |
- if dep_priority.ignored: |
| 26 |
+ if dep_priority.ignored and \ |
| 27 |
+ not self._dynamic_config._traverse_ignored_deps: |
| 28 |
if is_virt and dep.child is not None: |
| 29 |
traversed_virt_pkgs.add(dep.child) |
| 30 |
dep.child = None |
| 31 |
@@ -1573,7 +1574,8 @@ class depgraph(object): |
| 32 |
(virt_pkg.cpv, [str(x) for x in atoms]), |
| 33 |
noiselevel=-1, level=logging.DEBUG) |
| 34 |
|
| 35 |
- if not dep_priority.ignored: |
| 36 |
+ if not dep_priority.ignored or \ |
| 37 |
+ self._dynamic_config._traverse_ignored_deps: |
| 38 |
if not self._add_pkg(virt_pkg, virt_dep): |
| 39 |
return 0 |
| 40 |
|
| 41 |
@@ -1635,7 +1637,8 @@ class depgraph(object): |
| 42 |
self._dynamic_config._ignored_deps.append(dep) |
| 43 |
|
| 44 |
if not ignored: |
| 45 |
- if dep_priority.ignored: |
| 46 |
+ if dep_priority.ignored and \ |
| 47 |
+ not self._dynamic_config._traverse_ignored_deps: |
| 48 |
if is_virt and dep.child is not None: |
| 49 |
traversed_virt_pkgs.add(dep.child) |
| 50 |
dep.child = None |
Archives