| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-31 20:25:30 +0000 (Mon, 31 Mar 2008) |
| 3 |
New Revision: 9650 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Remove some redundant and obsolete code for warning about installed |
| 9 |
packages pulled into the graph. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-03-31 20:06:10 UTC (rev 9649) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-03-31 20:25:30 UTC (rev 9650) |
| 16 |
@@ -1827,28 +1827,8 @@ |
| 17 |
return 0 |
| 18 |
|
| 19 |
if pkg.installed: |
| 20 |
- # Warn if all matching ebuilds are masked or |
| 21 |
- # the installed package itself is masked. Do |
| 22 |
- # not warn if there are simply no matching |
| 23 |
- # ebuilds since that would be annoying in some |
| 24 |
- # cases: |
| 25 |
- # |
| 26 |
- # - binary packages installed from an overlay |
| 27 |
- # that is not listed in PORTDIR_OVERLAY |
| 28 |
- # |
| 29 |
- # - multi-slot atoms listed in the world file |
| 30 |
- # to prevent depclean from removing them |
| 31 |
- |
| 32 |
- if arg_atoms: |
| 33 |
- selective = "selective" in self.myparams |
| 34 |
- portdb = self.trees[pkg.root]["porttree"].dbapi |
| 35 |
- for arg, atom in arg_atoms: |
| 36 |
- all_ebuilds_masked = bool( |
| 37 |
- portdb.xmatch("match-all", atom) and |
| 38 |
- not portdb.xmatch("bestmatch-visible", atom)) |
| 39 |
- if all_ebuilds_masked and not selective: |
| 40 |
- self._missing_args.append((arg, atom)) |
| 41 |
- |
| 42 |
+ # Warn if an installed package is masked and it |
| 43 |
+ # is pulled into the graph. |
| 44 |
if not visible(pkgsettings, pkg): |
| 45 |
self._masked_installed.append((pkg, pkgsettings)) |
| 46 |
|
| 47 |
|
| 48 |
-- |
| 49 |
gentoo-commits@l.g.o mailing list |
Archives