From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 21 Nov 2010 03:05:10 +0000 (-0800)
Subject: Use Package.use.force/mask attributes.
X-Git-Tag: v2.2.0_alpha5~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=026a08fcb7e95e9c414c8104cd7e38a73675f6f5;p=portage.git

Use Package.use.force/mask attributes.

This optimizes the fix for bug #345979.
---

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)