From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-846035-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2984B1384B4 for <garchives@archives.gentoo.org>; Thu, 12 Nov 2015 18:56:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F63F21C0A6; Thu, 12 Nov 2015 18:56:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22CE721C0A6 for <gentoo-commits@lists.gentoo.org>; Thu, 12 Nov 2015 18:56:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A15D33BE2F for <gentoo-commits@lists.gentoo.org>; Thu, 12 Nov 2015 18:56:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF7EB1472 for <gentoo-commits@lists.gentoo.org>; Thu, 12 Nov 2015 18:56:49 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org> Message-ID: <1447354599.fd69b6822c9929d011e2da863b8dad162b803088.mgorny@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: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fd69b6822c9929d011e2da863b8dad162b803088 X-VCS-Branch: master Date: Thu, 12 Nov 2015 18:56:49 +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 X-Archives-Salt: 276a72f6-e8ad-434d-b4aa-56fb5966b693 X-Archives-Hash: 5794cce5e2e5f5cba07dbd3cc8dbd60a commit: fd69b6822c9929d011e2da863b8dad162b803088 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Nov 12 14:59:48 2015 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Nov 12 18:56:39 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=fd69b682 egencache: Delay updating Manifests until all other tasks complete Since thick Manifests can reference other files (ChangeLogs especially), their generation should be run as the lask task done by egencache, followed only by timestamp update. Fixes: https://bugs.gentoo.org/565626 bin/egencache | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bin/egencache b/bin/egencache index 76eb00b..a9d4657 100755 --- a/bin/egencache +++ b/bin/egencache @@ -1105,29 +1105,6 @@ def egencache_main(args): else: ret.append(gen_cache.returncode) - if options.update_manifests: - - cp_iter = None - if atoms: - cp_iter = iter(atoms) - - event_loop = global_event_loop() - scheduler = ManifestScheduler(portdb, cp_iter=cp_iter, - gpg_cmd=gpg_cmd, gpg_vars=gpg_vars, - force_sign_key=force_sign_key, - max_jobs=options.jobs, - max_load=options.load_average, - event_loop=event_loop) - - signum = run_main_scheduler(scheduler) - if signum is not None: - sys.exit(128 + signum) - - if options.tolerant: - ret.append(os.EX_OK) - else: - ret.append(scheduler.returncode) - if options.update_pkg_desc_index: if repo_config.writable: writable_location = repo_config.location @@ -1167,6 +1144,29 @@ def egencache_main(args): sys.exit(128 + signum) ret.append(gen_clogs.returncode) + if options.update_manifests: + + cp_iter = None + if atoms: + cp_iter = iter(atoms) + + event_loop = global_event_loop() + scheduler = ManifestScheduler(portdb, cp_iter=cp_iter, + gpg_cmd=gpg_cmd, gpg_vars=gpg_vars, + force_sign_key=force_sign_key, + max_jobs=options.jobs, + max_load=options.load_average, + event_loop=event_loop) + + signum = run_main_scheduler(scheduler) + if signum is not None: + sys.exit(128 + signum) + + if options.tolerant: + ret.append(os.EX_OK) + else: + ret.append(scheduler.returncode) + if options.write_timestamp: timestamp_path = os.path.join(repo_path, 'metadata', 'timestamp.chk') try: