Remove some redundant and obsolete code for warning about installed
authorZac Medico <zmedico@gentoo.org>
Mon, 31 Mar 2008 20:25:30 +0000 (20:25 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 31 Mar 2008 20:25:30 +0000 (20:25 -0000)
packages pulled into the graph.

svn path=/main/trunk/; revision=9650

pym/_emerge/__init__.py

index 848e0e893724ccef0ccb2f93a8ecb903f65149d2..e9d0fe7fddf3ff0269c05f6bf324245d6a2941ff 100644 (file)
@@ -1827,28 +1827,8 @@ class depgraph(object):
                                        return 0
 
                if pkg.installed:
-                       # Warn if all matching ebuilds are masked or
-                       # the installed package itself is masked. Do
-                       # not warn if there are simply no matching
-                       # ebuilds since that would be annoying in some
-                       # cases:
-                       #
-                       #  - binary packages installed from an overlay
-                       #    that is not listed in PORTDIR_OVERLAY
-                       #
-                       #  - multi-slot atoms listed in the world file
-                       #    to prevent depclean from removing them
-
-                       if arg_atoms:
-                               selective = "selective" in self.myparams
-                               portdb = self.trees[pkg.root]["porttree"].dbapi
-                               for arg, atom in arg_atoms:
-                                       all_ebuilds_masked = bool(
-                                               portdb.xmatch("match-all", atom) and
-                                               not portdb.xmatch("bestmatch-visible", atom))
-                                       if all_ebuilds_masked and not selective:
-                                               self._missing_args.append((arg, atom))
-
+                       # Warn if an installed package is masked and it
+                       # is pulled into the graph.
                        if not visible(pkgsettings, pkg):
                                self._masked_installed.append((pkg, pkgsettings))