Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 276813 | Differences between
and this patch

Collapse All | Expand All

(-)a/pym/portage/__init__.py (-18 / +4 lines)
Lines 3-9 Link Here
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Id$
4
# $Id$
5
5
6
7
VERSION="$Rev$"[6:-2] + "-svn"
6
VERSION="$Rev$"[6:-2] + "-svn"
8
7
9
# ===========================================================================
8
# ===========================================================================
Lines 110-116 except ImportError, e: Link Here
110
	sys.stderr.write("    "+str(e)+"\n\n")
109
	sys.stderr.write("    "+str(e)+"\n\n")
111
	raise
110
	raise
112
111
113
114
try:
112
try:
115
	import portage._selinux as selinux
113
	import portage._selinux as selinux
116
except OSError, e:
114
except OSError, e:
Lines 2387-2411 class config(object): Link Here
2387
		# Use the calculated USE flags to regenerate the USE_EXPAND flags so
2385
		# Use the calculated USE flags to regenerate the USE_EXPAND flags so
2388
		# that they are consistent. For optimal performance, use slice
2386
		# that they are consistent. For optimal performance, use slice
2389
		# comparison instead of startswith().
2387
		# comparison instead of startswith().
2390
		use_expand_split = self.get("USE_EXPAND", "").split()
2388
		use_expand_split = set(self.get("USE_EXPAND", "").split())
2391
		lazy_use_expand = self._lazy_use_expand(use, self.usemask,
2389
		lazy_use_expand = self._lazy_use_expand(use, self.usemask,
2392
			iuse_implicit, use_expand_split, self._use_expand_dict)
2390
			iuse_implicit, use_expand_split, self._use_expand_dict)
2393
		use_expand_iuse = set()
2394
		for key in use_expand_split:
2391
		for key in use_expand_split:
2395
			prefix = key.lower() + '_'
2392
			prefix = key.lower() + '_'
2396
			prefix_len = len(prefix)
2393
			prefix_len = len(prefix)
2397
			expand_flags = set( x[prefix_len:] for x in use \
2394
			use_expand_iuse = set( x for x in iuse_implicit \
2398
				if x[:prefix_len] == prefix )
2395
				if x[:prefix_len] == prefix )
2399
			use_expand_iuse.clear()
2400
			for x in iuse_implicit:
2401
				if x[:prefix_len] == prefix:
2402
					use_expand_iuse.add(x)
2403
			# * means to enable everything in IUSE that's not masked
2396
			# * means to enable everything in IUSE that's not masked
2404
			if use_expand_iuse and '*' in expand_flags:
2405
				for x in use_expand_iuse:
2406
					if x not in usemask:
2407
						use.add(x)
2408
			if use_expand_iuse:
2397
			if use_expand_iuse:
2398
				if prefix + '*' in use:
2399
					use.update( use_expand_iuse.difference(usemask) )
2409
				self.configdict['env'].addLazySingleton(
2400
				self.configdict['env'].addLazySingleton(
2410
					key, lazy_use_expand.__getitem__, key)
2401
					key, lazy_use_expand.__getitem__, key)
2411
			else:
2402
			else:
Lines 2858-2864 class config(object): Link Here
2858
			# an incremental!
2849
			# an incremental!
2859
			myincrementals.remove("USE")
2850
			myincrementals.remove("USE")
2860
2851
2861
2862
		mydbs = self.configlist[:-1]
2852
		mydbs = self.configlist[:-1]
2863
		mydbs.append(self.backupenv)
2853
		mydbs.append(self.backupenv)
2864
2854
Lines 6360-6366 def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, Link Here
6360
			# so do not check them again.
6350
			# so do not check them again.
6361
			checkme = []
6351
			checkme = []
6362
6352
6363
6364
		if not emerge_skip_distfiles and \
6353
		if not emerge_skip_distfiles and \
6365
			need_distfiles and not fetch(
6354
			need_distfiles and not fetch(
6366
			fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
6355
			fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
Lines 7221-7227 def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): Link Here
7221
7210
7222
	assert(False) # This point should not be reachable
7211
	assert(False) # This point should not be reachable
7223
7212
7224
7225
def dep_expand(mydep, mydb=None, use_cache=1, settings=None):
7213
def dep_expand(mydep, mydb=None, use_cache=1, settings=None):
7226
	if not len(mydep):
7214
	if not len(mydep):
7227
		return mydep
7215
		return mydep
Lines 7700-7706 def getmaskingstatus(mycpv, settings=None, portdb=None): Link Here
7700
7688
7701
	return rValue
7689
	return rValue
7702
7690
7703
7704
auxdbkeys=[
7691
auxdbkeys=[
7705
  'DEPEND',    'RDEPEND',   'SLOT',      'SRC_URI',
7692
  'DEPEND',    'RDEPEND',   'SLOT',      'SRC_URI',
7706
	'RESTRICT',  'HOMEPAGE',  'LICENSE',   'DESCRIPTION',
7693
	'RESTRICT',  'HOMEPAGE',  'LICENSE',   'DESCRIPTION',
Lines 8398-8404 def init_legacy_globals(): Link Here
8398
8385
8399
	root = settings["ROOT"]
8386
	root = settings["ROOT"]
8400
8387
8401
8402
	# ========================================================================
8388
	# ========================================================================
8403
	# COMPATIBILITY
8389
	# COMPATIBILITY
8404
	# These attributes should not be used
8390
	# These attributes should not be used

Return to bug 276813