[patch] faster_loops_in_setcpv_v1.patch

faster_loops_in_setcpv_v1.patch (text/plain), 2.84 KB, created by Marat Radchenko on 2009-07-10 07:18:49 UTC

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index f31a3f8..b824b10 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3,7 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-
 VERSION="$Rev$"[6:-2] + "-svn"
 
 # ===========================================================================
@@ -110,7 +109,6 @@ except ImportError, e:
 	sys.stderr.write("    "+str(e)+"\n\n")
 	raise
 
-
 try:
 	import portage._selinux as selinux
 except OSError, e:
@@ -2387,25 +2385,18 @@ class config(object):
 		# Use the calculated USE flags to regenerate the USE_EXPAND flags so
 		# that they are consistent. For optimal performance, use slice
 		# comparison instead of startswith().
-		use_expand_split = self.get("USE_EXPAND", "").split()
+		use_expand_split = set(self.get("USE_EXPAND", "").split())
 		lazy_use_expand = self._lazy_use_expand(use, self.usemask,
 			iuse_implicit, use_expand_split, self._use_expand_dict)
-		use_expand_iuse = set()
 		for key in use_expand_split:
 			prefix = key.lower() + '_'
 			prefix_len = len(prefix)
-			expand_flags = set( x[prefix_len:] for x in use \
+			use_expand_iuse = set( x for x in iuse_implicit \
 				if x[:prefix_len] == prefix )
-			use_expand_iuse.clear()
-			for x in iuse_implicit:
-				if x[:prefix_len] == prefix:
-					use_expand_iuse.add(x)
 			# * means to enable everything in IUSE that's not masked
-			if use_expand_iuse and '*' in expand_flags:
-				for x in use_expand_iuse:
-					if x not in usemask:
-						use.add(x)
 			if use_expand_iuse:
+				if prefix + '*' in use:
+					use.update( use_expand_iuse.difference(usemask) )
 				self.configdict['env'].addLazySingleton(
 					key, lazy_use_expand.__getitem__, key)
 			else:
@@ -2858,7 +2849,6 @@ class config(object):
 			# an incremental!
 			myincrementals.remove("USE")
 
-
 		mydbs = self.configlist[:-1]
 		mydbs.append(self.backupenv)
 
@@ -6360,7 +6350,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 			# so do not check them again.
 			checkme = []
 
-
 		if not emerge_skip_distfiles and \
 			need_distfiles and not fetch(
 			fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
@@ -7221,7 +7210,6 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None):
 
 	assert(False) # This point should not be reachable
 
-
 def dep_expand(mydep, mydb=None, use_cache=1, settings=None):
 	if not len(mydep):
 		return mydep
@@ -7700,7 +7688,6 @@ def getmaskingstatus(mycpv, settings=None, portdb=None):
 
 	return rValue
 
-
 auxdbkeys=[
   'DEPEND',    'RDEPEND',   'SLOT',      'SRC_URI',
 	'RESTRICT',  'HOMEPAGE',  'LICENSE',   'DESCRIPTION',
@@ -8398,7 +8385,6 @@ def init_legacy_globals():
 
 	root = settings["ROOT"]
 
-
 	# ========================================================================
 	# COMPATIBILITY
 	# These attributes should not be used