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

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

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-10-20 00:44:52 +0000 (Mon, 20 Oct 2008)
New Revision: 11704

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Revert previous 2 commits since they broke "selective" behavior.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-10-20 00:30:10 UTC (rev 11703)
+++ main/trunk/pym/_emerge/__init__.py	2008-10-20 00:44:52 UTC (rev 11704)
@@ -5417,17 +5417,20 @@
 		# Therefore, "selective" logic does not consider
 		# whether or not an installed package matches an
 		# argument atom. It only considers whether or not
-		# available packages match argument atoms.
+		# available packages match argument atoms, which is
+		# represented by the found_available_arg flag.
+		found_available_arg = False
 		for find_existing_node in True, False:
 			if existing_node:
 				break
 			for db, pkg_type, built, installed, db_keys in dbs:
 				if existing_node:
 					break
-				if not find_existing_node and \
-					installed and matched_packages and \
-					(reinstall or empty or not selective):
-					continue
+				if installed and not find_existing_node:
+					want_reinstall = reinstall or empty or \
+						(found_available_arg and not selective)
+					if want_reinstall and matched_packages:
+						continue
 				if hasattr(db, "xmatch"):
 					cpv_list = db.xmatch("match-all", atom)
 				else:
@@ -5565,6 +5568,8 @@
 							if not installed:
 								# masked by corruption
 								continue
+					if not installed and myarg:
+						found_available_arg = True
 
 					if atom.use and not pkg.built:
 						use = pkg.use.enabled