| 1 |
Author: zmedico |
| 2 |
Date: 2009-07-01 03:42:57 +0000 (Wed, 01 Jul 2009) |
| 3 |
New Revision: 13754 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/actions.py |
| 7 |
Log: |
| 8 |
Fix broken references to depgraph._dynamic_config and _frozen_config in |
| 9 |
calc_depclean(). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/actions.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/actions.py 2009-07-01 00:28:28 UTC (rev 13753) |
| 15 |
+++ main/trunk/pym/_emerge/actions.py 2009-07-01 03:42:57 UTC (rev 13754) |
| 16 |
@@ -405,7 +405,7 @@ |
| 17 |
if retval != os.EX_OK: |
| 18 |
return retval |
| 19 |
if "--buildpkgonly" in myopts: |
| 20 |
- graph_copy = mydepgraph.digraph.clone() |
| 21 |
+ graph_copy = mydepgraph._dynamic_config.digraph.copy() |
| 22 |
removed_nodes = set() |
| 23 |
for node in graph_copy: |
| 24 |
if not isinstance(node, Package) or \ |
| 25 |
@@ -419,7 +419,7 @@ |
| 26 |
return 1 |
| 27 |
else: |
| 28 |
if "--buildpkgonly" in myopts: |
| 29 |
- graph_copy = mydepgraph.digraph.clone() |
| 30 |
+ graph_copy = mydepgraph._dynamic_config.digraph.copy() |
| 31 |
removed_nodes = set() |
| 32 |
for node in graph_copy: |
| 33 |
if not isinstance(node, Package) or \ |
| 34 |
@@ -676,7 +676,7 @@ |
| 35 |
writemsg_level("\nCalculating dependencies ") |
| 36 |
resolver_params = create_depgraph_params(myopts, "remove") |
| 37 |
resolver = depgraph(settings, trees, myopts, resolver_params, spinner) |
| 38 |
- vardb = resolver.trees[myroot]["vartree"].dbapi |
| 39 |
+ vardb = resolver._frozen_config.trees[myroot]["vartree"].dbapi |
| 40 |
|
| 41 |
if action == "depclean": |
| 42 |
|
| 43 |
@@ -755,12 +755,12 @@ |
| 44 |
for s, package_set in required_sets.iteritems(): |
| 45 |
set_atom = SETPREFIX + s |
| 46 |
set_arg = SetArg(arg=set_atom, set=package_set, |
| 47 |
- root_config=resolver.roots[myroot]) |
| 48 |
+ root_config=resolver._frozen_config.roots[myroot]) |
| 49 |
set_args[s] = set_arg |
| 50 |
for atom in set_arg.set: |
| 51 |
- resolver._dep_stack.append( |
| 52 |
+ resolver._dynamic_config._dep_stack.append( |
| 53 |
Dependency(atom=atom, root=myroot, parent=set_arg)) |
| 54 |
- resolver.digraph.add(set_arg, None) |
| 55 |
+ resolver._dynamic_config.digraph.add(set_arg, None) |
| 56 |
|
| 57 |
success = resolver._complete_graph() |
| 58 |
writemsg_level("\b\b... done!\n") |
| 59 |
@@ -773,7 +773,7 @@ |
| 60 |
def unresolved_deps(): |
| 61 |
|
| 62 |
unresolvable = set() |
| 63 |
- for dep in resolver._initially_unsatisfied_deps: |
| 64 |
+ for dep in resolver._dynamic_config._initially_unsatisfied_deps: |
| 65 |
if isinstance(dep.parent, Package) and \ |
| 66 |
(dep.priority > UnmergeDepPriority.SOFT): |
| 67 |
unresolvable.add((dep.atom, dep.parent.cpv)) |
| 68 |
@@ -812,7 +812,7 @@ |
| 69 |
if unresolved_deps(): |
| 70 |
return 1, [], False, 0 |
| 71 |
|
| 72 |
- graph = resolver.digraph.copy() |
| 73 |
+ graph = resolver._dynamic_config.digraph.copy() |
| 74 |
required_pkgs_total = 0 |
| 75 |
for node in graph: |
| 76 |
if isinstance(node, Package): |
| 77 |
@@ -1075,7 +1075,7 @@ |
| 78 |
if unresolved_deps(): |
| 79 |
return 1, [], False, 0 |
| 80 |
|
| 81 |
- graph = resolver.digraph.copy() |
| 82 |
+ graph = resolver._dynamic_config.digraph.copy() |
| 83 |
required_pkgs_total = 0 |
| 84 |
for node in graph: |
| 85 |
if isinstance(node, Package): |
| 86 |
@@ -1116,7 +1116,8 @@ |
| 87 |
try: |
| 88 |
portage.dep._dep_check_strict = False |
| 89 |
success, atoms = portage.dep_check(depstr, None, settings, |
| 90 |
- myuse=node_use, trees=resolver._graph_trees, |
| 91 |
+ myuse=node_use, |
| 92 |
+ trees=resolver._frozen_config._graph_trees, |
| 93 |
myroot=myroot) |
| 94 |
finally: |
| 95 |
portage.dep._dep_check_strict = True |
Archives