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 2a03e196a3c63e4de6fdeb1c506ba0db0ff80ea7..bf90ce189eca12a0fe47ad7149771e285738d12b 100755 (executable)
--- 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,