Use constants for more hardcoded *DEPEND lists.

diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py
index 459affdb0161b0ebbda036621fba8063c9bdfa67..883203387c1d6f01fcb87dce9ce6b18752b7a888 100644 (file)
--- a/pym/_emerge/BlockerDB.py
+++ b/pym/_emerge/BlockerDB.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import sys
@@ -9,6 +9,7 @@ from portage import digraph
 from portage._sets.base import InternalPackageSet
 
 from _emerge.BlockerCache import BlockerCache
+from _emerge.Package import Package
 from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice
 
 if sys.hexversion >= 0x3000000:
@@ -38,7 +39,7 @@ class BlockerDB(object):
                """
                blocker_cache = BlockerCache(None,
                        self._vartree.dbapi)
-               dep_keys = ["RDEPEND", "PDEPEND"]
+               dep_keys = Package._runtime_keys
                settings = self._vartree.settings
                stale_cache = set(blocker_cache)
                fake_vartree = self._fake_vartree

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 4d731fb0df228336f8b218e7f0a92027cd155a89..1588f2c5edc590a1cb65279ce34da3357c6aa211 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3106,7 +3106,7 @@ class depgraph(object):
 
                if target_atom is not None and isinstance(node, Package):
                        affecting_use = set()
-                       for dep_str in "DEPEND", "RDEPEND", "PDEPEND", "HDEPEND":
+                       for dep_str in Package._dep_keys:
                                try:
                                        affecting_use.update(extract_affecting_use(
                                                node.metadata[dep_str], target_atom,
@@ -4138,7 +4138,7 @@ class depgraph(object):
                        if pkg not in self._dynamic_config.digraph.nodes:
                                return False
 
-                       for key in "DEPEND", "RDEPEND", "PDEPEND", "HDEPEND", "LICENSE":
+                       for key in Package._dep_keys + ("LICENSE",):
                                dep = pkg.metadata[key]
                                old_val = set(portage.dep.use_reduce(dep, pkg.use.enabled, is_valid_flag=pkg.iuse.is_valid_flag, flat=True))
                                new_val = set(portage.dep.use_reduce(dep, new_use, is_valid_flag=pkg.iuse.is_valid_flag, flat=True))
@@ -4898,7 +4898,7 @@ class depgraph(object):
                        # For installed packages, always ignore blockers from DEPEND since
                        # only runtime dependencies should be relevant for packages that
                        # are already built.
-                       dep_keys = ["RDEPEND", "PDEPEND"]
+                       dep_keys = Package._runtime_keys
                        for myroot in self._frozen_config.trees:
 
                                if self._frozen_config.myopts.get("--root-deps") is not None and \