From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 13 Feb 2011 08:33:51 +0000 (-0800)
Subject: egencache: don't ignore as much with --tolerant
X-Git-Tag: v2.1.9.40~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f514515a6b85286dcc84011143f9f550d96dc15a;p=portage.git

egencache: don't ignore as much with --tolerant

Errors returned from --update-use-local-desc and --update-changelogs
are no longer ignored with --tolerant. This will fix part of
bug #354687.
---

diff --git a/bin/egencache b/bin/egencache
index 76dd900e7..89d2fdec4 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -791,7 +791,10 @@ def egencache_main(args):
 			max_load=options.load_average,
 			rsync=options.rsync)
 		gen_cache.run()
-		ret.append(gen_cache.returncode)
+		if options.tolerant:
+			ret.append(os.EX_OK)
+		else:
+			ret.append(gen_cache.returncode)
 
 	if options.update_use_local_desc:
 		gen_desc = GenUseLocalDesc(portdb,
@@ -805,8 +808,6 @@ def egencache_main(args):
 		gen_clogs.run()
 		ret.append(gen_clogs.returncode)
 
-	if options.tolerant:
-		return ret[0]
 	return max(ret)
 
 if __name__ == "__main__":