[gentoo-commits] portage r9607 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-03-30 00:19:29 +0000 (Sun, 30 Mar 2008)
New Revision: 9607

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Bug #215308 - Simplify the greedy atoms logic so that it behaves more
like StaticFileSet and won't pull in lower slots.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-03-29 22:47:54 UTC (rev 9606)
+++ main/trunk/pym/_emerge/__init__.py	2008-03-30 00:19:29 UTC (rev 9607)
@@ -1985,29 +1985,12 @@
 		myslots = set()
 		for cpv in vardb.match(mykey):
 			myslots.add(vardb.aux_get(cpv, ["SLOT"])[0])
-		if myslots:
-			self._populate_filtered_repo(root, atom,
-				exclude_installed=True)
-			mymatches = filtered_db.match(atom)
-			best_pkg = portage.best(mymatches)
-			if best_pkg:
-				best_slot = filtered_db.aux_get(best_pkg, ["SLOT"])[0]
-				myslots.add(best_slot)
-		if len(myslots) > 1:
-			for myslot in myslots:
-				myslot_atom = "%s:%s" % (mykey, myslot)
-				self._populate_filtered_repo(
-					root, myslot_atom,
-					exclude_installed=True)
-				if filtered_db.match(myslot_atom):
-					yield myslot_atom
+		for myslot in myslots:
+			yield "%s:%s" % (mykey, myslot)
+		# In addition to any installed slots, also try to pull
+		# in the latest new slot that may be available.
+		yield atom
 
-		# Since populate_filtered_repo() was called with the
-		# exclude_installed flag, these atoms will need to be processed
-		# again in case installed packages are required to satisfy
-		# dependencies.
-		self._filtered_trees[root]["atoms"].clear()
-
 	def _iter_args_for_pkg(self, pkg):
 		# TODO: add multiple $ROOT support
 		if pkg.root != self.target_root:

-- 
gentoo-commits@l.g.o mailing list