| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-29 21:15:28 +0000 (Sat, 29 Mar 2008) |
| 3 |
New Revision: 9605 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
When all available ebuilds are masked, avoid producing warning message when |
| 9 |
the package does not need to be reinstalled and the installed version is not |
| 10 |
masked. (trunk r9457) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-03-29 20:29:07 UTC (rev 9604) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-03-29 21:15:28 UTC (rev 9605) |
| 17 |
@@ -1776,16 +1776,10 @@ |
| 18 |
# - multi-slot atoms listed in the world file |
| 19 |
# to prevent depclean from removing them |
| 20 |
|
| 21 |
- if arg: |
| 22 |
- all_ebuilds_masked = bool( |
| 23 |
- portdb.xmatch("match-all", arg) and |
| 24 |
- not portdb.xmatch("bestmatch-visible", arg)) |
| 25 |
- if all_ebuilds_masked: |
| 26 |
- self._missing_args.append(arg) |
| 27 |
- if "selective" not in self.myparams: |
| 28 |
- self._unsatisfied_deps_for_display.append( |
| 29 |
- ((pkg.root, arg), {"myparent":myparent})) |
| 30 |
- return 0 |
| 31 |
+ if arg and "selective" not in self.myparams: |
| 32 |
+ self._unsatisfied_deps_for_display.append( |
| 33 |
+ ((pkg.root, arg), {"myparent":myparent})) |
| 34 |
+ return 0 |
| 35 |
|
| 36 |
if not visible(pkgsettings, pkg.cpv, pkg.metadata, |
| 37 |
built=pkg.built, installed=pkg.installed): |
| 38 |
@@ -3116,19 +3110,6 @@ |
| 39 |
continue |
| 40 |
elif not vardb.match(x): |
| 41 |
self._world_problems = True |
| 42 |
- available = False |
| 43 |
- if "--usepkgonly" not in self.myopts and \ |
| 44 |
- portdb.match(x): |
| 45 |
- available = True |
| 46 |
- elif "--usepkg" in self.myopts: |
| 47 |
- for cpv in bindb.match(x): |
| 48 |
- metadata = dict(izip(bindb_keys, |
| 49 |
- bindb.aux_get(cpv, bindb_keys))) |
| 50 |
- if visible(pkgsettings, cpv, metadata, built=True): |
| 51 |
- available = True |
| 52 |
- break |
| 53 |
- if not available: |
| 54 |
- continue |
| 55 |
mylist.append(x) |
| 56 |
|
| 57 |
for myatom in mylist: |
| 58 |
|
| 59 |
-- |
| 60 |
gentoo-commits@l.g.o mailing list |
Archives