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

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-11-02 01:45:57 +0000 (Mon, 02 Nov 2009)
New Revision: 14774

Modified:
   main/trunk/pym/_emerge/PackageVirtualDbapi.py
   main/trunk/pym/_emerge/depgraph.py
Log:
Don't call FakeVartree.sync() redundantly when backtracking.


Modified: main/trunk/pym/_emerge/PackageVirtualDbapi.py
===================================================================
--- main/trunk/pym/_emerge/PackageVirtualDbapi.py	2009-11-01 22:24:23 UTC (rev 14773)
+++ main/trunk/pym/_emerge/PackageVirtualDbapi.py	2009-11-02 01:45:57 UTC (rev 14774)
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+import sys
 import portage
 
 class PackageVirtualDbapi(portage.dbapi):
@@ -37,6 +38,12 @@
 		obj._cpv_map = self._cpv_map.copy()
 		return obj
 
+	def __bool__(self):
+		return bool(self._cpv_map)
+
+	if sys.hexversion < 0x3000000:
+		__nonzero__ = __bool__
+
 	def __iter__(self):
 		return iter(self._cpv_map.values())
 

Modified: main/trunk/pym/_emerge/depgraph.py
===================================================================
--- main/trunk/pym/_emerge/depgraph.py	2009-11-01 22:24:23 UTC (rev 14773)
+++ main/trunk/pym/_emerge/depgraph.py	2009-11-02 01:45:57 UTC (rev 14774)
@@ -270,7 +270,10 @@
 				"--buildpkgonly" not in self._frozen_config.myopts
 
 			fake_vartree = self._frozen_config.trees[myroot]["vartree"]
-			fake_vartree.sync()
+			if not fake_vartree.dbapi:
+				# This needs to be called for the first depgraph, but not for
+				# backtracking depgraphs that share the same frozen_config.
+				fake_vartree.sync()
 
 			if preload_installed_pkgs:
 				vardb = fake_vartree.dbapi