From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-229222-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1NlRut-00023E-8p
	for garchives@archives.gentoo.org; Sat, 27 Feb 2010 19:01:32 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B089FE07D4;
	Sat, 27 Feb 2010 19:01:28 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 41E7CE07D4
	for <gentoo-commits@lists.gentoo.org>; Sat, 27 Feb 2010 19:01:28 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id BCF2C1B40FE
	for <gentoo-commits@lists.gentoo.org>; Sat, 27 Feb 2010 19:01:27 +0000 (UTC)
Received: from grobian by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <grobian@stork.gentoo.org>)
	id 1NlRup-0008Hz-AY
	for gentoo-commits@lists.gentoo.org; Sat, 27 Feb 2010 19:01:27 +0000
To: gentoo-commits@lists.gentoo.org
From: "Fabian Groffen (grobian)" <grobian@gentoo.org>
Subject: [gentoo-commits] portage r15480 - in main/branches/prefix/pym/portage: . dbapi package/ebuild util
X-VCS-Repository: portage
X-VCS-Revision: 15480
X-VCS-Files: main/branches/prefix/pym/portage/util/listdir.py main/branches/prefix/pym/portage/__init__.py main/branches/prefix/pym/portage/dbapi/bintree.py main/branches/prefix/pym/portage/dbapi/porttree.py main/branches/prefix/pym/portage/dbapi/vartree.py main/branches/prefix/pym/portage/package/ebuild/doebuild.py main/branches/prefix/pym/portage/util/digraph.py
X-VCS-Directories: . dbapi package/ebuild util
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1NlRup-0008Hz-AY@stork.gentoo.org>
Sender: Fabian Groffen <grobian@stork.gentoo.org>
Date: Sat, 27 Feb 2010 19:01:27 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 8734f229-df95-4983-9e1f-f9d5453458f0
X-Archives-Hash: 865c928703ad206248882ee78f8609ec

Author: grobian
Date: 2010-02-27 19:01:26 +0000 (Sat, 27 Feb 2010)
New Revision: 15480

Added:
   main/branches/prefix/pym/portage/util/listdir.py
Modified:
   main/branches/prefix/pym/portage/__init__.py
   main/branches/prefix/pym/portage/dbapi/bintree.py
   main/branches/prefix/pym/portage/dbapi/porttree.py
   main/branches/prefix/pym/portage/dbapi/vartree.py
   main/branches/prefix/pym/portage/package/ebuild/doebuild.py
   main/branches/prefix/pym/portage/util/digraph.py
Log:
   Merged from trunk -r15449:15451

   | 15450   | Move cacheddir and listdir to portage.util.listdir.       =
   |
   | zmedico |                                                           =
   |
  =20
   | 15451   | Fix broken references to                                  =
   |
   | zmedico | portage._doebuild_manifest_exempt_depend.                 =
   |


Modified: main/branches/prefix/pym/portage/__init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/branches/prefix/pym/portage/__init__.py	2010-02-27 18:53:28 UTC =
(rev 15479)
+++ main/branches/prefix/pym/portage/__init__.py	2010-02-27 19:01:26 UTC =
(rev 15480)
@@ -122,6 +122,7 @@
 			'stack_lists,unique_array,varexpand,writedict,writemsg,' + \
 			'writemsg_stdout,write_atomic',
 		'portage.util.digraph:digraph',
+		'portage.util.listdir:cacheddir,listdir',
 		'portage.versions',
 		'portage.versions:best,catpkgsplit,catsplit,cpv_getkey,' + \
 			'cpv_getkey@getCPFromCPV,endversion_keys,' + \
@@ -534,145 +535,6 @@
 		mylink=3Dmydir+"/"+mylink
 	return os.path.normpath(mylink)
=20
-dircache =3D {}
-cacheHit=3D0
-cacheMiss=3D0
-cacheStale=3D0
-def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, fol=
lowSymlinks=3DTrue):
-	global cacheHit,cacheMiss,cacheStale
-	mypath =3D normalize_path(my_original_path)
-	if mypath in dircache:
-		cacheHit +=3D 1
-		cached_mtime, list, ftype =3D dircache[mypath]
-	else:
-		cacheMiss +=3D 1
-		cached_mtime, list, ftype =3D -1, [], []
-	try:
-		pathstat =3D os.stat(mypath)
-		if stat.S_ISDIR(pathstat[stat.ST_MODE]):
-			mtime =3D pathstat.st_mtime
-		else:
-			raise portage.exception.DirectoryNotFound(mypath)
-	except EnvironmentError as e:
-		if e.errno =3D=3D portage.exception.PermissionDenied.errno:
-			raise portage.exception.PermissionDenied(mypath)
-		del e
-		return [], []
-	except portage.exception.PortageException:
-		return [], []
-	# Python retuns mtime in seconds, so if it was changed in the last few =
seconds, it could be invalid
-	if mtime !=3D cached_mtime or time.time() - mtime < 4:
-		if mypath in dircache:
-			cacheStale +=3D 1
-		try:
-			list =3D os.listdir(mypath)
-		except EnvironmentError as e:
-			if e.errno !=3D errno.EACCES:
-				raise
-			del e
-			raise portage.exception.PermissionDenied(mypath)
-		ftype =3D []
-		for x in list:
-			try:
-				if followSymlinks:
-					pathstat =3D os.stat(mypath+"/"+x)
-				else:
-					pathstat =3D os.lstat(mypath+"/"+x)
-
-				if stat.S_ISREG(pathstat[stat.ST_MODE]):
-					ftype.append(0)
-				elif stat.S_ISDIR(pathstat[stat.ST_MODE]):
-					ftype.append(1)
-				elif stat.S_ISLNK(pathstat[stat.ST_MODE]):
-					ftype.append(2)
-				else:
-					ftype.append(3)
-			except (IOError, OSError):
-				ftype.append(3)
-		dircache[mypath] =3D mtime, list, ftype
-
-	ret_list =3D []
-	ret_ftype =3D []
-	for x in range(0, len(list)):
-		if list[x] in ignorelist:
-			pass
-		elif ignorecvs:
-			if list[x][:2] !=3D ".#":
-				ret_list.append(list[x])
-				ret_ftype.append(ftype[x])
-		else:
-			ret_list.append(list[x])
-			ret_ftype.append(ftype[x])
-
-	writemsg("cacheddirStats: H:%d/M:%d/S:%d\n" % (cacheHit, cacheMiss, cac=
heStale),10)
-	return ret_list, ret_ftype
-
-_ignorecvs_dirs =3D ('CVS', 'SCCS', '.svn', '.git')
-
-def listdir(mypath, recursive=3DFalse, filesonly=3DFalse, ignorecvs=3DFa=
lse, ignorelist=3D[], followSymlinks=3DTrue,
-	EmptyOnError=3DFalse, dirsonly=3DFalse):
-	"""
-	Portage-specific implementation of os.listdir
-
-	@param mypath: Path whose contents you wish to list
-	@type mypath: String
-	@param recursive: Recursively scan directories contained within mypath
-	@type recursive: Boolean
-	@param filesonly; Only return files, not more directories
-	@type filesonly: Boolean
-	@param ignorecvs: Ignore CVS directories ('CVS','SCCS','.svn','.git')
-	@type ignorecvs: Boolean
-	@param ignorelist: List of filenames/directories to exclude
-	@type ignorelist: List
-	@param followSymlinks: Follow Symlink'd files and directories
-	@type followSymlinks: Boolean
-	@param EmptyOnError: Return [] if an error occurs (deprecated, always T=
rue)
-	@type EmptyOnError: Boolean
-	@param dirsonly: Only return directories.
-	@type dirsonly: Boolean
-	@rtype: List
-	@returns: A list of files and directories (or just files or just direct=
ories) or an empty list.
-	"""
-
-	list, ftype =3D cacheddir(mypath, ignorecvs, ignorelist, EmptyOnError, =
followSymlinks)
-
-	if list is None:
-		list=3D[]
-	if ftype is None:
-		ftype=3D[]
-
-	if not (filesonly or dirsonly or recursive):
-		return list
-
-	if recursive:
-		x=3D0
-		while x<len(ftype):
-			if ftype[x] =3D=3D 1 and not \
-				(ignorecvs and os.path.basename(list[x]) in _ignorecvs_dirs):
-				l,f =3D cacheddir(mypath+"/"+list[x], ignorecvs, ignorelist, EmptyOn=
Error,
-					followSymlinks)
-
-				l=3Dl[:]
-				for y in range(0,len(l)):
-					l[y]=3Dlist[x]+"/"+l[y]
-				list=3Dlist+l
-				ftype=3Dftype+f
-			x+=3D1
-	if filesonly:
-		rlist=3D[]
-		for x in range(0,len(ftype)):
-			if ftype[x]=3D=3D0:
-				rlist=3Drlist+[list[x]]
-	elif dirsonly:
-		rlist =3D []
-		for x in range(0, len(ftype)):
-			if ftype[x] =3D=3D 1:
-				rlist =3D rlist + [list[x]]=09
-	else:
-		rlist=3Dlist
-
-	return rlist
-
 #parse /etc/env.d and generate /etc/profile.env
=20
 def env_update(makelinks=3D1, target_root=3DNone, prev_mtimes=3DNone, co=
ntents=3DNone,
@@ -1017,209 +879,6 @@
=20
 	return (version,None)
=20
-# XXX This would be to replace getstatusoutput completely.
-# XXX Issue: cannot block execution. Deadlock condition.
-def spawn(mystring, mysettings, debug=3D0, free=3D0, droppriv=3D0, sesan=
dbox=3D0, fakeroot=3D0, **keywords):
-	"""
-	Spawn a subprocess with extra portage-specific options.
-	Optiosn include:
-
-	Sandbox: Sandbox means the spawned process will be limited in its abili=
ty t
-	read and write files (normally this means it is restricted to ${D}/)
-	SElinux Sandbox: Enables sandboxing on SElinux
-	Reduced Privileges: Drops privilages such that the process runs as port=
age:portage
-	instead of as root.
-
-	Notes: os.system cannot be used because it messes with signal handling.=
  Instead we
-	use the portage.process spawn* family of functions.
-
-	This function waits for the process to terminate.
-
-	@param mystring: Command to run
-	@type mystring: String
-	@param mysettings: Either a Dict of Key,Value pairs or an instance of p=
ortage.config
-	@type mysettings: Dictionary or config instance
-	@param debug: Ignored
-	@type debug: Boolean
-	@param free: Enable sandboxing for this process
-	@type free: Boolean
-	@param droppriv: Drop to portage:portage when running this command
-	@type droppriv: Boolean
-	@param sesandbox: Enable SELinux Sandboxing (toggles a context switch)
-	@type sesandbox: Boolean
-	@param fakeroot: Run this command with faked root privileges
-	@type fakeroot: Boolean
-	@param keywords: Extra options encoded as a dict, to be passed to spawn
-	@type keywords: Dictionary
-	@rtype: Integer
-	@returns:
-	1. The return code of the spawned process.
-	"""
-
-	if isinstance(mysettings, dict):
-		env=3Dmysettings
-		keywords["opt_name"]=3D"[ %s ]" % "portage"
-	else:
-		check_config_instance(mysettings)
-		env=3Dmysettings.environ()
-		if mysettings.mycpv is not None:
-			keywords["opt_name"] =3D "[%s]" % mysettings.mycpv
-		else:
-			keywords["opt_name"] =3D "[%s/%s]" % \
-				(mysettings.get("CATEGORY",""), mysettings.get("PF",""))
-
-	fd_pipes =3D keywords.get("fd_pipes")
-	if fd_pipes is None:
-		fd_pipes =3D {
-			0:sys.stdin.fileno(),
-			1:sys.stdout.fileno(),
-			2:sys.stderr.fileno(),
-		}
-	# In some cases the above print statements don't flush stdout, so
-	# it needs to be flushed before allowing a child process to use it
-	# so that output always shows in the correct order.
-	stdout_filenos =3D (sys.stdout.fileno(), sys.stderr.fileno())
-	for fd in fd_pipes.values():
-		if fd in stdout_filenos:
-			sys.stdout.flush()
-			sys.stderr.flush()
-			break
-
-	# The default policy for the sesandbox domain only allows entry (via ex=
ec)
-	# from shells and from binaries that belong to portage (the number of e=
ntry
-	# points is minimized).  The "tee" binary is not among the allowed entr=
y
-	# points, so it is spawned outside of the sesandbox domain and reads fr=
om a
-	# pseudo-terminal that connects two domains.
-	logfile =3D keywords.get("logfile")
-	mypids =3D []
-	master_fd =3D None
-	slave_fd =3D None
-	fd_pipes_orig =3D None
-	got_pty =3D False
-	if logfile:
-		del keywords["logfile"]
-		if 1 not in fd_pipes or 2 not in fd_pipes:
-			raise ValueError(fd_pipes)
-
-		got_pty, master_fd, slave_fd =3D \
-			_create_pty_or_pipe(copy_term_size=3Dfd_pipes[1])
-
-		if not got_pty and 'sesandbox' in mysettings.features \
-			and mysettings.selinux_enabled():
-			# With sesandbox, logging works through a pty but not through a
-			# normal pipe. So, disable logging if ptys are broken.
-			# See Bug #162404.
-			logfile =3D None
-			os.close(master_fd)
-			master_fd =3D None
-			os.close(slave_fd)
-			slave_fd =3D None
-
-	if logfile:
-
-		fd_pipes.setdefault(0, sys.stdin.fileno())
-		fd_pipes_orig =3D fd_pipes.copy()
-
-		# We must set non-blocking mode before we close the slave_fd
-		# since otherwise the fcntl call can fail on FreeBSD (the child
-		# process might have already exited and closed slave_fd so we
-		# have to keep it open in order to avoid FreeBSD potentially
-		# generating an EAGAIN exception).
-		import fcntl
-		fcntl.fcntl(master_fd, fcntl.F_SETFL,
-			fcntl.fcntl(master_fd, fcntl.F_GETFL) | os.O_NONBLOCK)
-
-		fd_pipes[0] =3D fd_pipes_orig[0]
-		fd_pipes[1] =3D slave_fd
-		fd_pipes[2] =3D slave_fd
-		keywords["fd_pipes"] =3D fd_pipes
-
-	features =3D mysettings.features
-	# TODO: Enable fakeroot to be used together with droppriv.  The
-	# fake ownership/permissions will have to be converted to real
-	# permissions in the merge phase.
-	fakeroot =3D fakeroot and uid !=3D 0 and portage.process.fakeroot_capab=
le
-	if droppriv and not uid and portage_gid and portage_uid:
-		keywords.update({"uid":portage_uid,"gid":portage_gid,
-			"groups":userpriv_groups,"umask":0o02})
-	if not free:
-		free=3D((droppriv and "usersandbox" not in features) or \
-			(not droppriv and "sandbox" not in features and \
-			"usersandbox" not in features and not fakeroot))
-
-	if not free and not (fakeroot or process.sandbox_capable):
-		free =3D True
-
-	if free or "SANDBOX_ACTIVE" in os.environ:
-		keywords["opt_name"] +=3D " bash"
-		spawn_func =3D portage.process.spawn_bash
-	elif fakeroot:
-		keywords["opt_name"] +=3D " fakeroot"
-		keywords["fakeroot_state"] =3D os.path.join(mysettings["T"], "fakeroot=
.state")
-		spawn_func =3D portage.process.spawn_fakeroot
-	else:
-		keywords["opt_name"] +=3D " sandbox"
-		spawn_func =3D portage.process.spawn_sandbox
-
-	if sesandbox:
-		spawn_func =3D selinux.spawn_wrapper(spawn_func,
-			mysettings["PORTAGE_SANDBOX_T"])
-
-	returnpid =3D keywords.get("returnpid")
-	keywords["returnpid"] =3D True
-	try:
-		mypids.extend(spawn_func(mystring, env=3Denv, **keywords))
-	finally:
-		if logfile:
-			os.close(slave_fd)
-
-	if returnpid:
-		return mypids
-
-	if logfile:
-		log_file =3D open(_unicode_encode(logfile), mode=3D'ab')
-		apply_secpass_permissions(logfile,
-			uid=3Dportage_uid, gid=3Dportage_gid, mode=3D0o664)
-		stdout_file =3D os.fdopen(os.dup(fd_pipes_orig[1]), 'wb')
-		master_file =3D os.fdopen(master_fd, 'rb')
-		iwtd =3D [master_file]
-		owtd =3D []
-		ewtd =3D []
-		import array, select
-		buffsize =3D 65536
-		eof =3D False
-		while not eof:
-			events =3D select.select(iwtd, owtd, ewtd)
-			for f in events[0]:
-				# Use non-blocking mode to prevent read
-				# calls from blocking indefinitely.
-				buf =3D array.array('B')
-				try:
-					buf.fromfile(f, buffsize)
-				except EOFError:
-					pass
-				if not buf:
-					eof =3D True
-					break
-				if f is master_file:
-					buf.tofile(stdout_file)
-					stdout_file.flush()
-					buf.tofile(log_file)
-					log_file.flush()
-		log_file.close()
-		stdout_file.close()
-		master_file.close()
-	pid =3D mypids[-1]
-	retval =3D os.waitpid(pid, 0)[1]
-	portage.process.spawned_pids.remove(pid)
-	if retval !=3D os.EX_OK:
-		if retval & 0xff:
-			return (retval & 0xff) << 8
-		return retval >> 8
-	return retval
-
-=3D=3D=3D=3D=3D=3D=3D
->>>>>>> .merge-right.r15449
 def digestgen(myarchives=3DNone, mysettings=3DNone,
 	overwrite=3DNone, manifestonly=3DNone, myportdb=3DNone):
 	"""

Modified: main/branches/prefix/pym/portage/dbapi/bintree.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/branches/prefix/pym/portage/dbapi/bintree.py	2010-02-27 18:53:28=
 UTC (rev 15479)
+++ main/branches/prefix/pym/portage/dbapi/bintree.py	2010-02-27 19:01:26=
 UTC (rev 15480)
@@ -13,6 +13,7 @@
 	'portage.package.ebuild.doebuild:_vdb_use_conditional_atoms',
 	'portage.update:update_dbentries',
 	'portage.util:ensure_dirs,normalize_path,writemsg,writemsg_stdout',
+	'portage.util.listdir:listdir',
 	'portage.versions:best,catpkgsplit,catsplit',
 )
=20
@@ -23,7 +24,7 @@
 from portage.const import EAPI
 from portage.localization import _
=20
-from portage import dep_expand, listdir, _movefile
+from portage import dep_expand, _movefile
 from portage import os
 from portage import _encodings
 from portage import _unicode_decode

Modified: main/branches/prefix/pym/portage/dbapi/porttree.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/branches/prefix/pym/portage/dbapi/porttree.py	2010-02-27 18:53:2=
8 UTC (rev 15479)
+++ main/branches/prefix/pym/portage/dbapi/porttree.py	2010-02-27 19:01:2=
6 UTC (rev 15480)
@@ -11,9 +11,11 @@
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.checksum',
-	'portage.dep:dep_getkey,match_from_list,paren_reduce,use_reduce',
+	'portage.dep:dep_getkey,flatten,match_from_list,paren_reduce,use_reduce=
',
 	'portage.env.loaders:KeyValuePairFileLoader',
+	'portage.package.ebuild.doebuild:doebuild',
 	'portage.util:ensure_dirs,writemsg,writemsg_level',
+	'portage.util.listdir:listdir',
 	'portage.versions:best,catpkgsplit,_pkgsplit@pkgsplit,ver_regexp',
 )
=20
@@ -27,8 +29,8 @@
 from portage.localization import _
 from portage.manifest import Manifest
=20
-from portage import eclass_cache, auxdbkeys, doebuild, flatten, \
-	listdir, dep_expand, eapi_is_supported, dep_check, \
+from portage import eclass_cache, auxdbkeys, \
+	dep_expand, eapi_is_supported, dep_check, \
 	_eapi_is_deprecated
 from portage import os
 from portage import _encodings

Modified: main/branches/prefix/pym/portage/dbapi/vartree.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/branches/prefix/pym/portage/dbapi/vartree.py	2010-02-27 18:53:28=
 UTC (rev 15479)
+++ main/branches/prefix/pym/portage/dbapi/vartree.py	2010-02-27 19:01:26=
 UTC (rev 15480)
@@ -12,7 +12,7 @@
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.checksum:_perform_md5_merge@perform_md5',
-	'portage.dep:dep_getkey,isjustname,match_from_list,' + \
+	'portage.dep:dep_getkey,isjustname,flatten,match_from_list,' + \
 	 	'use_reduce,paren_reduce,_slot_re',
 	'portage.elog:elog_process',
 	'portage.locks:lockdir,unlockdir',
@@ -24,7 +24,10 @@
 	'portage.util:apply_secpass_permissions,ConfigProtect,ensure_dirs,' + \
 		'writemsg,writemsg_level,write_atomic,atomic_ofstream,writedict,' + \
 		'grabfile,grabdict,normalize_path,new_protect_filename,getlibpaths',
-	'portage.versions:best,catpkgsplit,catsplit,pkgcmp,_pkgsplit@pkgsplit',
+	'portage.util.digraph:digraph',
+	'portage.util.listdir:dircache,listdir',
+	'portage.versions:best,catpkgsplit,catsplit,cpv_getkey,pkgcmp,' + \
+		'_pkgsplit@pkgsplit',
 )
=20
 from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, \
@@ -36,9 +39,8 @@
 	FileNotFound, PermissionDenied, UnsupportedAPIException
 from portage.localization import _
=20
-from portage import listdir, dep_expand, digraph, flatten, \
-	env_update, \
-	abssymlink, movefile, _movefile, bsd_chflags, cpv_getkey
+from portage import dep_expand, env_update, \
+	abssymlink, movefile, _movefile, bsd_chflags
=20
 # This is a special version of the os module, wrapped for unicode suppor=
t.
 from portage import os
@@ -2077,7 +2079,6 @@
 		self.mtdircache.pop(pkg_dblink.cat, None)
 		self.matchcache.pop(pkg_dblink.cat, None)
 		self.cpcache.pop(pkg_dblink.mysplit[0], None)
-		from portage import dircache
 		dircache.pop(pkg_dblink.dbcatdir, None)
=20
 	def match(self, origdep, use_cache=3D1):

Modified: main/branches/prefix/pym/portage/package/ebuild/doebuild.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/branches/prefix/pym/portage/package/ebuild/doebuild.py	2010-02-2=
7 18:53:28 UTC (rev 15479)
+++ main/branches/prefix/pym/portage/package/ebuild/doebuild.py	2010-02-2=
7 19:01:26 UTC (rev 15480)
@@ -280,7 +280,7 @@
 	if os.path.exists(exit_status_file):
 		os.unlink(exit_status_file)
=20
-_doebuild_manifest_exempt_depend =3D 0
+
 _doebuild_manifest_cache =3D None
 _doebuild_broken_ebuilds =3D set()
 _doebuild_broken_manifests =3D set()
@@ -401,16 +401,13 @@
 			noiselevel=3D-1)
 		return 1
=20
-	global _doebuild_manifest_exempt_depend
-
 	if "strict" in features and \
 		"digest" not in features and \
 		tree =3D=3D "porttree" and \
 		mydo not in ("digest", "manifest", "help") and \
-		not _doebuild_manifest_exempt_depend:
+		not portage._doebuild_manifest_exempt_depend:
 		# Always verify the ebuild checksums before executing it.
-		global _doebuild_manifest_cache, _doebuild_broken_ebuilds, \
-			_doebuild_broken_ebuilds
+		global _doebuild_manifest_cache, _doebuild_broken_ebuilds
=20
 		if myebuild in _doebuild_broken_ebuilds:
 			return 1
@@ -508,7 +505,7 @@
 		if mydo in ("digest", "manifest", "help"):
 			# Temporarily exempt the depend phase from manifest checks, in case
 			# aux_get calls trigger cache generation.
-			_doebuild_manifest_exempt_depend +=3D 1
+			portage._doebuild_manifest_exempt_depend +=3D 1
=20
 		# If we don't need much space and we don't need a constant location,
 		# we can temporarily override PORTAGE_TMPDIR with a random temp dir
@@ -1023,7 +1020,7 @@
 		if mydo in ("digest", "manifest", "help"):
 			# If necessary, depend phase has been triggered by aux_get calls
 			# and the exemption is no longer needed.
-			_doebuild_manifest_exempt_depend -=3D 1
+			portage._doebuild_manifest_exempt_depend -=3D 1
=20
 def _validate_deps(mysettings, myroot, mydo, mydbapi):
=20

Modified: main/branches/prefix/pym/portage/util/digraph.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/branches/prefix/pym/portage/util/digraph.py	2010-02-27 18:53:28 =
UTC (rev 15479)
+++ main/branches/prefix/pym/portage/util/digraph.py	2010-02-27 19:01:26 =
UTC (rev 15480)
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
=20
+__all__ =3D ['digraph']
+
 from portage.util import writemsg
=20
 class digraph(object):

Copied: main/branches/prefix/pym/portage/util/listdir.py (from rev 15451,=
 main/trunk/pym/portage/util/listdir.py)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/branches/prefix/pym/portage/util/listdir.py	                    =
    (rev 0)
+++ main/branches/prefix/pym/portage/util/listdir.py	2010-02-27 19:01:26 =
UTC (rev 15480)
@@ -0,0 +1,153 @@
+# Copyright 2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+__all__ =3D ['cacheddir', 'listdir']
+
+import errno
+import stat
+import time
+
+from portage import os
+from portage.exception import DirectoryNotFound, PermissionDenied, Porta=
geException
+from portage.util import normalize_path, writemsg
+
+dircache =3D {}
+cacheHit =3D 0
+cacheMiss =3D 0
+cacheStale =3D 0
+
+def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, fol=
lowSymlinks=3DTrue):
+	global cacheHit,cacheMiss,cacheStale
+	mypath =3D normalize_path(my_original_path)
+	if mypath in dircache:
+		cacheHit +=3D 1
+		cached_mtime, list, ftype =3D dircache[mypath]
+	else:
+		cacheMiss +=3D 1
+		cached_mtime, list, ftype =3D -1, [], []
+	try:
+		pathstat =3D os.stat(mypath)
+		if stat.S_ISDIR(pathstat[stat.ST_MODE]):
+			mtime =3D pathstat.st_mtime
+		else:
+			raise DirectoryNotFound(mypath)
+	except EnvironmentError as e:
+		if e.errno =3D=3D PermissionDenied.errno:
+			raise PermissionDenied(mypath)
+		del e
+		return [], []
+	except PortageException:
+		return [], []
+	# Python retuns mtime in seconds, so if it was changed in the last few =
seconds, it could be invalid
+	if mtime !=3D cached_mtime or time.time() - mtime < 4:
+		if mypath in dircache:
+			cacheStale +=3D 1
+		try:
+			list =3D os.listdir(mypath)
+		except EnvironmentError as e:
+			if e.errno !=3D errno.EACCES:
+				raise
+			del e
+			raise PermissionDenied(mypath)
+		ftype =3D []
+		for x in list:
+			try:
+				if followSymlinks:
+					pathstat =3D os.stat(mypath+"/"+x)
+				else:
+					pathstat =3D os.lstat(mypath+"/"+x)
+
+				if stat.S_ISREG(pathstat[stat.ST_MODE]):
+					ftype.append(0)
+				elif stat.S_ISDIR(pathstat[stat.ST_MODE]):
+					ftype.append(1)
+				elif stat.S_ISLNK(pathstat[stat.ST_MODE]):
+					ftype.append(2)
+				else:
+					ftype.append(3)
+			except (IOError, OSError):
+				ftype.append(3)
+		dircache[mypath] =3D mtime, list, ftype
+
+	ret_list =3D []
+	ret_ftype =3D []
+	for x in range(0, len(list)):
+		if list[x] in ignorelist:
+			pass
+		elif ignorecvs:
+			if list[x][:2] !=3D ".#":
+				ret_list.append(list[x])
+				ret_ftype.append(ftype[x])
+		else:
+			ret_list.append(list[x])
+			ret_ftype.append(ftype[x])
+
+	writemsg("cacheddirStats: H:%d/M:%d/S:%d\n" % (cacheHit, cacheMiss, cac=
heStale),10)
+	return ret_list, ret_ftype
+
+_ignorecvs_dirs =3D ('CVS', 'SCCS', '.svn', '.git')
+
+def listdir(mypath, recursive=3DFalse, filesonly=3DFalse, ignorecvs=3DFa=
lse, ignorelist=3D[], followSymlinks=3DTrue,
+	EmptyOnError=3DFalse, dirsonly=3DFalse):
+	"""
+	Portage-specific implementation of os.listdir
+
+	@param mypath: Path whose contents you wish to list
+	@type mypath: String
+	@param recursive: Recursively scan directories contained within mypath
+	@type recursive: Boolean
+	@param filesonly; Only return files, not more directories
+	@type filesonly: Boolean
+	@param ignorecvs: Ignore CVS directories ('CVS','SCCS','.svn','.git')
+	@type ignorecvs: Boolean
+	@param ignorelist: List of filenames/directories to exclude
+	@type ignorelist: List
+	@param followSymlinks: Follow Symlink'd files and directories
+	@type followSymlinks: Boolean
+	@param EmptyOnError: Return [] if an error occurs (deprecated, always T=
rue)
+	@type EmptyOnError: Boolean
+	@param dirsonly: Only return directories.
+	@type dirsonly: Boolean
+	@rtype: List
+	@returns: A list of files and directories (or just files or just direct=
ories) or an empty list.
+	"""
+
+	list, ftype =3D cacheddir(mypath, ignorecvs, ignorelist, EmptyOnError, =
followSymlinks)
+
+	if list is None:
+		list=3D[]
+	if ftype is None:
+		ftype=3D[]
+
+	if not (filesonly or dirsonly or recursive):
+		return list
+
+	if recursive:
+		x=3D0
+		while x<len(ftype):
+			if ftype[x] =3D=3D 1 and not \
+				(ignorecvs and os.path.basename(list[x]) in _ignorecvs_dirs):
+				l,f =3D cacheddir(mypath+"/"+list[x], ignorecvs, ignorelist, EmptyOn=
Error,
+					followSymlinks)
+
+				l=3Dl[:]
+				for y in range(0,len(l)):
+					l[y]=3Dlist[x]+"/"+l[y]
+				list=3Dlist+l
+				ftype=3Dftype+f
+			x+=3D1
+	if filesonly:
+		rlist=3D[]
+		for x in range(0,len(ftype)):
+			if ftype[x]=3D=3D0:
+				rlist=3Drlist+[list[x]]
+	elif dirsonly:
+		rlist =3D []
+		for x in range(0, len(ftype)):
+			if ftype[x] =3D=3D 1:
+				rlist =3D rlist + [list[x]]=09
+	else:
+		rlist=3Dlist
+
+	return rlist