From 63970f5c610e16478c08459669dfc2e1abf8c0f2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 25 Sep 2012 20:15:51 -0700 Subject: Use constants for hardcoded *DEPEND lists. --- pym/_emerge/depgraph.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pym/_emerge/depgraph.py') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index dee3f1f91..4d731fb0d 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -503,8 +503,6 @@ class _dynamic_depgraph_config(object): class depgraph(object): pkg_tree_map = RootConfig.pkg_tree_map - - _dep_keys = ["DEPEND", "RDEPEND", "PDEPEND", "HDEPEND"] def __init__(self, settings, trees, myopts, myparams, spinner, frozen_config=None, backtrack_parameters=BacktrackParameter(), allow_backtracking=False): @@ -1682,8 +1680,7 @@ class depgraph(object): eapi_attrs = _get_eapi_attrs(pkg.metadata["EAPI"]) edepend={} - depkeys = ["DEPEND","RDEPEND","PDEPEND","HDEPEND"] - for k in depkeys: + for k in Package._dep_keys: edepend[k] = metadata[k] if not pkg.built and \ @@ -2848,7 +2845,7 @@ class depgraph(object): return [pkg.slot_atom for pkg in greedy_pkgs] blockers = {} - blocker_dep_keys = ["DEPEND", "PDEPEND", "RDEPEND", "HDEPEND"] + blocker_dep_keys = Package._dep_keys for pkg in greedy_pkgs + [highest_pkg]: dep_str = " ".join(pkg.metadata[k] for k in blocker_dep_keys) try: -- cgit v1.2.3-1-g7c22