diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-20 19:05:10 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-20 19:05:10 -0800 |
| commit | 026a08fcb7e95e9c414c8104cd7e38a73675f6f5 (patch) | |
| tree | 9fdc1e2112fe6073eebc104406d3d4cc4f1c1f64 | |
| parent | 615634b3c636d13639119567f2ade9ec24e9397f (diff) | |
| download | portage-026a08fcb7e95e9c414c8104cd7e38a73675f6f5.tar.gz portage-026a08fcb7e95e9c414c8104cd7e38a73675f6f5.tar.bz2 portage-026a08fcb7e95e9c414c8104cd7e38a73675f6f5.zip | |
Use Package.use.force/mask attributes.
This optimizes the fix for bug #345979.
| -rw-r--r-- | pym/_emerge/depgraph.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index a93062583..8c9d3f049 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2990,8 +2990,7 @@ class depgraph(object): atom.use.missing_enabled.difference(pkg.iuse.all)) if need_enabled: if not pkg.built: - pkgsettings.setcpv(pkg) - if not pkgsettings.usemask.intersection(need_enabled): + if not pkg.use.mask.intersection(need_enabled): # Be careful about masked flags, since they # typically aren't adjustable by the user. packages_with_invalid_use_config.append(pkg) @@ -3001,9 +3000,8 @@ class depgraph(object): need_disabled = atom.use.disabled.intersection(use) if need_disabled: if not pkg.built: - pkgsettings.setcpv(pkg) - if not pkgsettings.useforce.difference( - pkgsettings.usemask).intersection(need_disabled): + if not pkg.use.force.difference( + pkg.use.mask).intersection(need_disabled): # Be careful about forced flags, since they # typically aren't adjustable by the user. packages_with_invalid_use_config.append(pkg) |