summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-31 20:25:30 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-31 20:25:30 +0000
commitb4dae0f6fcab08f159ae376228a5d5f861e8bfef (patch)
treed84b50e435999a5d96d1a52f34678521b21040a7
parent1a74ace5fbb231ea96ad5798d89bc8f59d73dac5 (diff)
downloadportage-b4dae0f6fcab08f159ae376228a5d5f861e8bfef.tar.gz
portage-b4dae0f6fcab08f159ae376228a5d5f861e8bfef.tar.bz2
portage-b4dae0f6fcab08f159ae376228a5d5f861e8bfef.zip
Remove some redundant and obsolete code for warning about installed
packages pulled into the graph. svn path=/main/trunk/; revision=9650
-rw-r--r--pym/_emerge/__init__.py24
1 files changed, 2 insertions, 22 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 848e0e893..e9d0fe7fd 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -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))