From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Poq7J-0008AL-G9 for garchives@archives.gentoo.org; Mon, 14 Feb 2011 04:32:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBCA8E0960; Mon, 14 Feb 2011 04:31:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8AE60E0960 for ; Mon, 14 Feb 2011 04:31:36 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59E151B4100 for ; Mon, 14 Feb 2011 04:31:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BE0528006A for ; Mon, 14 Feb 2011 04:31:35 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:2.1.9 commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/egencache X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f514515a6b85286dcc84011143f9f550d96dc15a Date: Mon, 14 Feb 2011 04:31:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: acc75daf59152763ca02c96291f74137 commit: f514515a6b85286dcc84011143f9f550d96dc15a Author: Zac Medico gentoo org> AuthorDate: Sun Feb 13 08:33:51 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 14 04:26:54 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df514515a 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. --- bin/egencache | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/egencache b/bin/egencache index 76dd900..89d2fde 100755 --- a/bin/egencache +++ b/bin/egencache @@ -791,7 +791,10 @@ def egencache_main(args): max_load=3Doptions.load_average, rsync=3Doptions.rsync) gen_cache.run() - ret.append(gen_cache.returncode) + if options.tolerant: + ret.append(os.EX_OK) + else: + ret.append(gen_cache.returncode) =20 if options.update_use_local_desc: gen_desc =3D GenUseLocalDesc(portdb, @@ -805,8 +808,6 @@ def egencache_main(args): gen_clogs.run() ret.append(gen_clogs.returncode) =20 - if options.tolerant: - return ret[0] return max(ret) =20 if __name__ =3D=3D "__main__":