depgraph: merge some logic from bug #350254
authorZac Medico <zmedico@gentoo.org>
Mon, 3 Jan 2011 09:01:54 +0000 (01:01 -0800)
committerZac Medico <zmedico@gentoo.org>
Mon, 3 Jan 2011 09:01:54 +0000 (01:01 -0800)
pym/_emerge/depgraph.py

index b3f9984cd399a0894f1134b3a8731009c72764b9..8ea9c8bbf540d123d50a3b7cfcb026e97b928da6 100644 (file)
@@ -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