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

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

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-04-24 20:40:11 +0000 (Thu, 24 Apr 2008)
New Revision: 9963

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Rename the "consistent" depgraph parameter to "complete" since what it
really means is that the graph will be complete in the sense that no
known dependencies are neglected.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-04-24 18:00:13 UTC (rev 9962)
+++ main/trunk/pym/_emerge/__init__.py	2008-04-24 20:40:11 UTC (rev 9963)
@@ -382,7 +382,7 @@
 	if "--deep" in myopts:
 		myparams.add("deep")
 	if "--complete-graph" in myopts:
-		myparams.add("consistent")
+		myparams.add("complete")
 	return myparams
 
 # search functionality
@@ -1860,7 +1860,7 @@
 		nodeps = "--nodeps" in self.myopts
 		empty = "empty" in self.myparams
 		deep = "deep" in self.myparams
-		consistent = "consistent" in self.myparams
+		complete = "complete" in self.myparams
 		update = "--update" in self.myopts and dep.depth <= 1
 		if dep.blocker:
 			if not buildpkgonly and \
@@ -1904,7 +1904,7 @@
 						# should have been masked.
 						raise
 			if not myarg:
-				if consistent:
+				if complete:
 					self._ignored_deps.append(dep)
 				return 1
 
@@ -2052,7 +2052,7 @@
 			return 1
 		elif pkg.installed and \
 			"deep" not in self.myparams:
-			if "consistent" not in self.myparams:
+			if "complete" not in self.myparams:
 				return 1
 			dep_stack = self._ignored_deps
 
@@ -2942,7 +2942,7 @@
 		Since this method can consume enough time to disturb users, it is
 		currently only enabled by the --complete-graph option.
 		"""
-		if "consistent" not in self.myparams:
+		if "complete" not in self.myparams:
 			# Skip this to avoid consuming enough time to disturb users.
 			return 1
 

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