diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-09-27 22:47:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-09-27 22:47:52 +0000 |
| commit | b9d0318ac97f852c9d181a6d62f4b09e99da5c9b (patch) | |
| tree | d3c43884bc890ffc901504407454c40cfc55d6ac /bin/ebuild | |
| parent | d3f1e28b113115c6fbbccf928d58bb11b6a5301b (diff) | |
| download | portage-b9d0318ac97f852c9d181a6d62f4b09e99da5c9b.tar.gz portage-b9d0318ac97f852c9d181a6d62f4b09e99da5c9b.tar.bz2 portage-b9d0318ac97f852c9d181a6d62f4b09e99da5c9b.zip | |
Handle KeyError thrown from aux_get(). (trunk r7866)
svn path=/main/branches/2.1.2/; revision=7867
Diffstat (limited to 'bin/ebuild')
| -rwxr-xr-x | bin/ebuild | 11 |
1 files changed, 6 insertions, 5 deletions
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, |