diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-11-09 10:13:17 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-11-09 10:13:17 -0800 |
| commit | f363a020a74df08d46dd4fa8b43a5fab85034951 (patch) | |
| tree | 2ae04fe333125f1a8aabfcf70b91769a3ffa3673 /pym | |
| parent | 6245e82305818d36eaa0a5392cb78de791f5e00a (diff) | |
| download | portage-f363a020a74df08d46dd4fa8b43a5fab85034951.tar.gz portage-f363a020a74df08d46dd4fa8b43a5fab85034951.tar.bz2 portage-f363a020a74df08d46dd4fa8b43a5fab85034951.zip | |
Use get(REQUIRED_USE) for emphasis.
None of these cases should raise KeyError, but use get(REQUIRED_USE)
anyway to emphasize that care must be taken.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/depgraph.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 2296aa001..fda335fcc 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1089,7 +1089,7 @@ class depgraph(object): # package selection, since we want to prompt the user # for USE adjustment rather than have REQUIRED_USE # affect package selection and || dep choices. - if not pkg.built and pkg.metadata["REQUIRED_USE"] and \ + if not pkg.built and pkg.metadata.get("REQUIRED_USE") and \ eapi_has_required_use(pkg.metadata["EAPI"]): required_use_is_sat = check_required_use( pkg.metadata["REQUIRED_USE"], @@ -3011,7 +3011,7 @@ class depgraph(object): raise if not mreasons and \ not pkg.built and \ - pkg.metadata["REQUIRED_USE"] and \ + pkg.metadata.get("REQUIRED_USE") and \ eapi_has_required_use(pkg.metadata["EAPI"]): if not check_required_use( pkg.metadata["REQUIRED_USE"], @@ -3692,7 +3692,7 @@ class depgraph(object): if new_changes != old_changes: #Don't do the change if it violates REQUIRED_USE. - required_use = pkg.metadata["REQUIRED_USE"] + required_use = pkg.metadata.get("REQUIRED_USE") if required_use and check_required_use(required_use, old_use, pkg.iuse.is_valid_flag) and \ not check_required_use(required_use, new_use, pkg.iuse.is_valid_flag): return old_use |