From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 5 Sep 2006 20:30:04 +0000 (-0000)
Subject: During env_update, raise a FileNotFound exception if a file is unexpectedly removed... 
X-Git-Tag: v2.1.1~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d0c61651262bb9032f4738ad0404c615b03e873;p=portage.git

During env_update, raise a FileNotFound exception if a file is unexpectedly removed by a concurrent process.  See bug #146412.

svn path=/main/trunk/; revision=4408
---

diff --git a/pym/portage.py b/pym/portage.py
index dee3005a5..f94870b87 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -500,6 +500,9 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None):
 			writemsg("!!! '%s'\n" % str(e), noiselevel=-1)
 			del e
 			continue
+		if myconfig is None:
+			# file removed by a concurrent process
+			raise portage_exception.FileNotFound(file_path)
 		# process PATH, CLASSPATH, LDPATH
 		for myspec in specials.keys():
 			if myconfig.has_key(myspec):