aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-01-03 09:01:54 (GMT)
committerZac Medico <zmedico@gentoo.org>2011-01-03 09:01:54 (GMT)
commit177a4ac82f3d2bef88dc1ac193373b6b6a23a953 (patch)
tree6b40da2750e2dda95d01e9da149cb46fc8f8aaaf
parentcreate_trees: whitelist SSH_AGENT_PID/AUTH_SOCK (diff)
downloadportage-177a4ac82f3d2bef88dc1ac193373b6b6a23a953.zip
portage-177a4ac82f3d2bef88dc1ac193373b6b6a23a953.tar.gz
portage-177a4ac82f3d2bef88dc1ac193373b6b6a23a953.tar.bz2
depgraph: merge some logic from bug #350254
-rw-r--r--pym/_emerge/depgraph.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index b3f9984..8ea9c8b 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2841,7 +2841,8 @@ class depgraph(object):
modified_use=self._pkg_use_enabled(pkg)):
continue
- if dont_miss_updates:
+ if packages_with_invalid_use_config and \
+ (not pkg.installed or dont_miss_updates):
# Check if a higher version was rejected due to user
# USE configuration. The packages_with_invalid_use_config
# list only contains unbuilt ebuilds since USE can't