[gentoo-commits] proj/portage:master commit in: pym/portage/util/

[Zac Medico]

commit:     284ec5d603c713509534fe6230964decf8a7468a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 15:02:12 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 15:02:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=284ec5d6

getconfig: handle recursive PermissionDenied

---
 pym/portage/util/__init__.py |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 59d4fa4..7c16b7b 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -564,6 +564,18 @@ _invalid_var_name_re = re.compile(r'^\d|\W')
 def getconfig(mycfg, tolerant=False, allow_sourcing=False, expand=True,
 	recursive=False):
 
+	is_dir = False
+	if recursive:
+		try:
+			is_dir = stat.S_ISDIR(os.stat(mycfg).st_mode)
+		except OSError as e:
+			if e.errno == PermissionDenied.errno:
+				raise PermissionDenied(mycfg)
+			elif e.errno in (errno.ENOENT, errno.ESTALE, errno.EISDIR):
+				return None
+			else:
+				raise
+
 	if isinstance(expand, dict):
 		# Some existing variable definitions have been
 		# passed in, for use in substitutions.
@@ -573,11 +585,15 @@ def getconfig(mycfg, tolerant=False, allow_sourcing=False, expand=True,
 		expand_map = {}
 	mykeys = {}
 
-	if recursive and os.path.isdir(mycfg):
-		# Use source commands so that syntax error messages
+	if recursive and is_dir:
+		# Emulate source commands so that syntax error messages
 		# can display real file names and line numbers.
+		def onerror(e):
+			if e.errno == PermissionDenied.errno:
+				raise PermissionDenied(mycfg)
+
 		recursive_files = []
-		for parent, dirs, files in os.walk(mycfg):
+		for parent, dirs, files in os.walk(mycfg, onerror=onerror):
 			try:
 				parent = _unicode_decode(parent,
 					encoding=_encodings['fs'], errors='strict')