Regen penalty killportage_2_0_50_pre16b

2 files changed, 28 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 2495833..bb13406 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,19 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.520 2004/01/13 01:45:56 carpaski Exp $
+# $Id: ChangeLog,v 1.521 2004/01/13 23:03:58 carpaski Exp $
 
-*portage-2.0.50_pre15 (11 Jan 2004): Quick Fixes -- ~arch version
+*portage-2.0.50_pre16 (13 Jan 2004): Quick Fixes -- ~arch version
+
+  13 Jan 2004; Nicholas Jones <carpaski@gentoo.org> portage.py: Removed an
+  unnecessary depend call that double eclass-using ebuild's cache regen
+  time.
+
+*portage-2.0.50_pre15 (12 Jan 2004): Quick Fixes -- ~arch version
 
   12 Jan 2004; Nicholas Jones <carpaski@gentoo.org> portage.py: Unmerge
   traceback fix.
 
-*portage-2.0.50_pre14 (11 Jan 2004): Quick Fixes -- ~arch version
+*portage-2.0.50_pre14 (12 Jan 2004): Quick Fixes -- ~arch version
 
   12 Jan 2004; Nicholas Jones <carpaski@gentoo.org> emerge: Fix for
   traceback on '-S'.
diff --git a/pym/portage.py b/pym/portage.py
index 2d2805c..de9e67c 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1,7 +1,7 @@
 # portage.py -- core Portage functionality
 # Copyright 1998-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Distributed under the GNU Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.373 2004/01/13 01:45:58 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.374 2004/01/13 23:03:58 carpaski Exp $
 
 VERSION="2.0.50_pre15"
 
@@ -4410,23 +4410,24 @@ class portdbapi(dbapi):
 				except:
 					pass
 			
-				if debug:
-					writemsg("Generating cache entry(2) for: "+str(myebuild)+"\n")
-				myret=doebuild(myebuild,"depend","/",self.mysettings)
-				if myret:
-					#depend returned non-zero exit code...
-					writemsg(str(red("\naux_get():")+" (2) Error in "+mycpv+" ebuild. ("+str(myret)+")\n"
-					  "               Check for syntax error or corruption in the ebuild. (--debug)\n\n"))
-					raise KeyError
-				try:
-					os.utime(mydbkey,(emtime,emtime))
-					mycent=open(mydbkey,"r")
-				except (IOError, OSError):
-					writemsg(str(red("\naux_get():")+" (3) Error in "+mycpv+" ebuild.\n"
-					  "               Check for syntax error or corruption in the ebuild. (--debug)\n\n"))
-					raise KeyError
-				mylines=mycent.readlines()
-				mycent.close()
+				if usingmdcache:
+					if debug:
+						writemsg("Generating cache entry(2) for: "+str(myebuild)+"\n")
+					myret=doebuild(myebuild,"depend","/",self.mysettings)
+					if myret:
+						#depend returned non-zero exit code...
+						writemsg(str(red("\naux_get():")+" (2) Error in "+mycpv+" ebuild. ("+str(myret)+")\n"
+						  "               Check for syntax error or corruption in the ebuild. (--debug)\n\n"))
+						raise KeyError
+					try:
+						os.utime(mydbkey,(emtime,emtime))
+						mycent=open(mydbkey,"r")
+					except (IOError, OSError):
+						writemsg(str(red("\naux_get():")+" (3) Error in "+mycpv+" ebuild.\n"
+						  "               Check for syntax error or corruption in the ebuild. (--debug)\n\n"))
+						raise KeyError
+					mylines=mycent.readlines()
+					mycent.close()
 
 			#print "stale: pre"
 			if stale: