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 <gentoo-commits+bounces-315843-garchives=archives.gentoo.org@lists.gentoo.org>) id 1PoXTD-0007QH-1p for garchives@archives.gentoo.org; Sun, 13 Feb 2011 08:38:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89777E094F; Sun, 13 Feb 2011 08:38:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5861DE094F for <gentoo-commits@lists.gentoo.org>; Sun, 13 Feb 2011 08:38:07 +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 A6BB71B40A5 for <gentoo-commits@lists.gentoo.org>; Sun, 13 Feb 2011 08:38:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D20CD8006A for <gentoo-commits@lists.gentoo.org>; Sun, 13 Feb 2011 08:38:05 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <c8ca6cd53805162d5c8722e9519815152c993a3c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master 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: c8ca6cd53805162d5c8722e9519815152c993a3c Date: Sun, 13 Feb 2011 08:38:05 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e8cb2b1da2b68392b08540ff22830b27 commit: c8ca6cd53805162d5c8722e9519815152c993a3c Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Feb 13 08:33:51 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Feb 13 08:33:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc8ca6cd5 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__":