[gentoo-commits] portage r9605 - main/branches/2.1.2/bin

[gentoo-commits] portage r9605 - main/branches/2.1.2/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-03-29 21:15:28 +0000 (Sat, 29 Mar 2008)
New Revision: 9605

Modified:
   main/branches/2.1.2/bin/emerge
Log:
When all available ebuilds are masked, avoid producing warning message when
the package does not need to be reinstalled and the installed version is not
masked. (trunk r9457)


Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge	2008-03-29 20:29:07 UTC (rev 9604)
+++ main/branches/2.1.2/bin/emerge	2008-03-29 21:15:28 UTC (rev 9605)
@@ -1776,16 +1776,10 @@
 			#  - multi-slot atoms listed in the world file
 			#    to prevent depclean from removing them
 
-			if arg:
-				all_ebuilds_masked = bool(
-					portdb.xmatch("match-all", arg) and
-					not portdb.xmatch("bestmatch-visible", arg))
-				if all_ebuilds_masked:
-					self._missing_args.append(arg)
-				if "selective" not in self.myparams:
-					self._unsatisfied_deps_for_display.append(
-						((pkg.root, arg), {"myparent":myparent}))
-					return 0
+			if arg and "selective" not in self.myparams:
+				self._unsatisfied_deps_for_display.append(
+					((pkg.root, arg), {"myparent":myparent}))
+				return 0
 
 			if not visible(pkgsettings, pkg.cpv, pkg.metadata,
 				built=pkg.built, installed=pkg.installed):
@@ -3116,19 +3110,6 @@
 					continue
 				elif not vardb.match(x):
 					self._world_problems = True
-					available = False
-					if "--usepkgonly" not in self.myopts and \
-						portdb.match(x):
-						available = True
-					elif "--usepkg" in self.myopts:
-						for cpv in bindb.match(x):
-							metadata = dict(izip(bindb_keys,
-								bindb.aux_get(cpv, bindb_keys)))
-							if visible(pkgsettings, cpv, metadata, built=True):
-								available = True
-								break
-					if not available:
-						continue
 				mylist.append(x)
 
 		for myatom in mylist:

-- 
gentoo-commits@lists.gentoo.org mailing list