From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EB7B31384B4 for ; Sat, 12 Dec 2015 23:42:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CE6DE08BB; Sat, 12 Dec 2015 23:42:57 +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 9FC0EE08BB for ; Sat, 12 Dec 2015 23:42:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B8BC34074E for ; Sat, 12 Dec 2015 23:42:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32904A86 for ; Sat, 12 Dec 2015 23:42:50 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1449963641.32b372bf79633bbfe6c7b1f5bca2f290a32695d4.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/sync/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/sync/controller.py X-VCS-Directories: pym/portage/sync/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 32b372bf79633bbfe6c7b1f5bca2f290a32695d4 X-VCS-Branch: master Date: Sat, 12 Dec 2015 23:42:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7ffb63a1-0cd2-4d8f-9b09-a8ebdab71096 X-Archives-Hash: 754e657f7e6c262f1429bf4b807731ab commit: 32b372bf79633bbfe6c7b1f5bca2f290a32695d4 Author: Zac Medico gentoo org> AuthorDate: Sat Dec 12 22:24:04 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Dec 12 23:40:41 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=32b372bf SyncManager.sync: always return 4-tuple (bug 567932) Since commit 496ff326dc18890889d1ea5d2aec590394635960, invalid repos.conf settings or failure of the pre_sync method caused SyncManager.sync to return an incorrect number of values. Fixes: 496ff326dc18 ("sync repositories in parallel (bug 557426)") X-Gentoo-Bug: 567932 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=567932 Acked-by: Brian Dolbec gentoo.org> pym/portage/sync/controller.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py index e71ba67..92be3cb 100644 --- a/pym/portage/sync/controller.py +++ b/pym/portage/sync/controller.py @@ -129,16 +129,17 @@ class SyncManager(object): self.repo = repo self.exitcode = 1 self.updatecache_flg = False + hooks_enabled = master_hooks or not repo.sync_hooks_only_on_change if repo.sync_type in self.module_names: tasks = [self.module_controller.get_class(repo.sync_type)] else: msg = "\n%s: Sync module '%s' is not an installed/known type'\n" \ % (bad("ERROR"), repo.sync_type) - return self.exitcode, msg + return self.exitcode, msg, self.updatecache_flg, hooks_enabled rval = self.pre_sync(repo) if rval != os.EX_OK: - return rval, None + return rval, None, self.updatecache_flg, hooks_enabled # need to pass the kwargs dict to the modules # so they are available if needed. @@ -157,7 +158,6 @@ class SyncManager(object): taskmaster = TaskHandler(callback=self.do_callback) taskmaster.run_tasks(tasks, func, status, options=task_opts) - hooks_enabled = False if (master_hooks or self.updatecache_flg or not repo.sync_hooks_only_on_change): hooks_enabled = True