From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 Sep 2007 22:47:52 +0000 (-0000)
Subject: Handle KeyError thrown from aux_get(). (trunk r7866)
X-Git-Tag: v2.1.3.16~96
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b9d0318ac97f852c9d181a6d62f4b09e99da5c9b;p=portage.git

Handle KeyError thrown from aux_get(). (trunk r7866)

svn path=/main/branches/2.1.2/; revision=7867
---

diff --git a/bin/ebuild b/bin/ebuild
index 2a03e196a..bf90ce189 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -162,12 +162,13 @@ def stale_env_warning():
 checked_for_stale_env = False
 
 for arg in pargs:
-	if not checked_for_stale_env and arg not in ("digest","manifest"):
-		# This has to go after manifest generation since otherwise
-		# aux_get() might fail due to invalid ebuild digests.
-		stale_env_warning()
-		checked_for_stale_env = True
 	try:
+		if not checked_for_stale_env and arg not in ("digest","manifest"):
+			# This has to go after manifest generation since otherwise
+			# aux_get() might fail due to invalid ebuild digests.
+			stale_env_warning()
+			checked_for_stale_env = True
+
 		if arg == "digest" and force:
 			discard_digests(ebuild, tmpsettings, portage.portdb)
 		a = portage.doebuild(ebuild, arg, portage.root, tmpsettings,