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 AA7451384B4 for ; Tue, 29 Dec 2015 20:29:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 494E021C003; Tue, 29 Dec 2015 20:29:18 +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 EA09F21C003 for ; Tue, 29 Dec 2015 20:29:17 +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 023BB33F9D2 for ; Tue, 29 Dec 2015 20:29:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC83713A for ; Tue, 29 Dec 2015 20:29:12 +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: <1451420861.87e32d4863f3f72ace3fc123b04a0e6f5ff96799.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/scanner.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 87e32d4863f3f72ace3fc123b04a0e6f5ff96799 X-VCS-Branch: master Date: Tue, 29 Dec 2015 20:29:12 +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: cb40bcfb-0aa6-4a3f-93e3-1599e81369a0 X-Archives-Hash: f9d3684255237234fada3c1abc0b0620 commit: 87e32d4863f3f72ace3fc123b04a0e6f5ff96799 Author: Zac Medico gentoo org> AuthorDate: Mon Dec 28 02:09:34 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Dec 29 20:27:41 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=87e32d48 repoman: fix KeyError triggered by fetch failure during manifest generation (bug 569942) Fix Scanner not to override portdbapi._aux_cache_keys when generating manifests, since spawn_nofetch requires additional keys. Fixes: 39d81c514c33 ("[...]config.__getitem__(): Partially drop backward compatibility for nonexistent keys.") X-Gentoo-Bug: 569942 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=569942 Acked-by: Brian Dolbec gentoo.org> pym/repoman/scanner.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 9a87f65..d1c10d7 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -93,9 +93,13 @@ class Scanner(object): self.portdb.settings = self.repo_settings.repoman_settings # We really only need to cache the metadata that's necessary for visibility # filtering. Anything else can be discarded to reduce memory consumption. - self.portdb._aux_cache_keys.clear() - self.portdb._aux_cache_keys.update( - ["EAPI", "IUSE", "KEYWORDS", "repository", "SLOT"]) + if self.options.mode != "manifest" and self.options.digest != "y": + # Don't do this when generating manifests, since that uses + # additional keys if spawn_nofetch is called (RESTRICT and + # DEFINED_PHASES). + self.portdb._aux_cache_keys.clear() + self.portdb._aux_cache_keys.update( + ["EAPI", "IUSE", "KEYWORDS", "repository", "SLOT"]) self.reposplit = myreporoot.split(os.path.sep) self.repolevel = len(self.reposplit)