diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-25 20:15:51 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-25 20:15:51 -0700 |
| commit | 63970f5c610e16478c08459669dfc2e1abf8c0f2 (patch) | |
| tree | 00c0bfccac1008e2950ddcd757c551e647201754 /pym/_emerge | |
| parent | 356b518fd996e4fd4719e9d350078326eb64c0d9 (diff) | |
| download | portage-63970f5c610e16478c08459669dfc2e1abf8c0f2.tar.gz portage-63970f5c610e16478c08459669dfc2e1abf8c0f2.tar.bz2 portage-63970f5c610e16478c08459669dfc2e1abf8c0f2.zip | |
Use constants for hardcoded *DEPEND lists.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/FakeVartree.py | 6 | ||||
| -rw-r--r-- | pym/_emerge/Package.py | 4 | ||||
| -rw-r--r-- | pym/_emerge/actions.py | 3 | ||||
| -rw-r--r-- | pym/_emerge/depgraph.py | 7 |
4 files changed, 8 insertions, 12 deletions
diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index b3c913348..5fde8e16b 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -75,8 +75,7 @@ class FakeVartree(vartree): self.dbapi.aux_get = self._aux_get_wrapper self.dbapi.match = self._match_wrapper self._aux_get_history = set() - self._portdb_keys = ["EAPI", "DEPEND", "HDEPEND", - "KEYWORDS", "PDEPEND", "RDEPEND"] + self._portdb_keys = Package._dep_keys + ("EAPI", "KEYWORDS") self._portdb = portdb self._global_updates = None @@ -287,8 +286,7 @@ def grab_global_updates(portdb): return retupdates def perform_global_updates(mycpv, mydb, myupdates): - aux_keys = ["DEPEND", "EAPI", "HDEPEND", - "RDEPEND", "PDEPEND", 'repository'] + aux_keys = Package._dep_keys + ("EAPI", 'repository') aux_dict = dict(zip(aux_keys, mydb.aux_get(mycpv, aux_keys))) eapi = aux_dict.pop('EAPI') repository = aux_dict.pop('repository') diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 00d00fe25..b60f74486 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -41,7 +41,9 @@ class Package(Task): "repository", "PROPERTIES", "RESTRICT", "SLOT", "USE", "_mtime_", "DEFINED_PHASES", "REQUIRED_USE"] - _dep_keys = ('DEPEND', 'HDEPEND' 'PDEPEND', 'RDEPEND',) + _dep_keys = ('DEPEND', 'HDEPEND', 'PDEPEND', 'RDEPEND') + _buildtime_keys = ('DEPEND', 'HDEPEND') + _runtime_keys = ('PDEPEND', 'RDEPEND') _use_conditional_misc_keys = ('LICENSE', 'PROPERTIES', 'RESTRICT') UNKNOWN_REPO = _unknown_repo diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index af7ae8f7e..f7ec07ab4 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1147,7 +1147,6 @@ def calc_depclean(settings, trees, ldpath_mtimes, graph = digraph() del cleanlist[:] - dep_keys = ["DEPEND", "HDEPEND", "RDEPEND", "PDEPEND"] runtime = UnmergeDepPriority(runtime=True) runtime_post = UnmergeDepPriority(runtime_post=True) buildtime = UnmergeDepPriority(buildtime=True) @@ -1160,7 +1159,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, for node in clean_set: graph.add(node, None) - for dep_type in dep_keys: + for dep_type in Package._dep_keys: depstr = node.metadata[dep_type] if not depstr: continue 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: |