From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 6 Nov 2008 20:08:02 +0000 (-0000)
Subject: Bug #245661 - Never enable --complete-graph automatically since it's confusing
X-Git-Tag: v2.2_rc14~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1db563f849d6b3f87e9c60151d3bdeb2ae8cc35e;p=portage.git

Bug #245661 - Never enable --complete-graph automatically since it's confusing
for users.

svn path=/main/trunk/; revision=11814
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 597aace59..f514624fa 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4167,14 +4167,7 @@ class depgraph(object):
 
 	_dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"]
 
-	# If dep calculation time exceeds this value then automatically
-	# enable "complete" mode since any performance difference is
-	# not as likely to be noticed by the user after this much time
-	# has passed.
-	_complete_threshold = 20
-
 	def __init__(self, settings, trees, myopts, myparams, spinner):
-		self._creation_time = time.time()
 		self.settings = settings
 		self.target_root = settings["ROOT"]
 		self.myopts = myopts
@@ -5764,19 +5757,15 @@ class depgraph(object):
 		intially satisfied.
 
 		Since this method can consume enough time to disturb users, it is
-		currently only enabled by the --complete-graph option, or when
-		dep calculation time exceeds self._complete_threshold.
+		currently only enabled by the --complete-graph option.
 		"""
 		if "--buildpkgonly" in self.myopts or \
 			"recurse" not in self.myparams:
 			return 1
 
 		if "complete" not in self.myparams:
-			if time.time() - self._creation_time > self._complete_threshold:
-				self.myparams.add("complete")
-			else:
-				# Skip this to avoid consuming enough time to disturb users.
-				return 1
+			# Skip this to avoid consuming enough time to disturb users.
+			return 1
 
 		# Put the depgraph into a mode that causes it to only
 		# select packages that have already been added to the