From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E534138334 for ; Thu, 24 Oct 2019 15:07:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C383AE0805; Thu, 24 Oct 2019 15:07:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A180CE0802 for ; Thu, 24 Oct 2019 15:07:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 375B734C278 for ; Thu, 24 Oct 2019 15:07:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA453884 for ; Thu, 24 Oct 2019 15:07:31 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1571929556.8d941d9c0e77eaab787df5f19ab97ca8a2fd6cff.haubi@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/ekeyword/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/ekeyword/ekeyword.py X-VCS-Directories: pym/gentoolkit/ekeyword/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 8d941d9c0e77eaab787df5f19ab97ca8a2fd6cff X-VCS-Branch: master Date: Thu, 24 Oct 2019 15:07:31 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8595d28c-bfa8-4e6a-81bb-2b23e9ca31e6 X-Archives-Hash: ae67a7957efd70331e0f8011cbad8948 commit: 8d941d9c0e77eaab787df5f19ab97ca8a2fd6cff Author: Michael Haubenwallner gentoo org> AuthorDate: Thu Oct 24 15:05:35 2019 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Thu Oct 24 15:05:56 2019 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=8d941d9c ekeyword: fix for when main-repo != "gentoo" Closes: https://bugs.gentoo.org/698256 Signed-off-by: Michael Haubenwallner gentoo.org> pym/gentoolkit/ekeyword/ekeyword.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/gentoolkit/ekeyword/ekeyword.py b/pym/gentoolkit/ekeyword/ekeyword.py index 94c5885..cf2a15e 100755 --- a/pym/gentoolkit/ekeyword/ekeyword.py +++ b/pym/gentoolkit/ekeyword/ekeyword.py @@ -346,7 +346,7 @@ def portage_settings(): return portage.db[portage.root]['vartree'].settings -def load_profile_data(portdir=None, repo='gentoo'): +def load_profile_data(portdir=None, repo=None): """Load the list of known arches from the tree Args: @@ -357,6 +357,8 @@ def load_profile_data(portdir=None, repo='gentoo'): A dict mapping the keyword to its preferred state: {'x86': 'stable', 'mips': 'dev', ...} """ + if repo is None: + repo = portage_settings().repositories.mainRepo().name if portdir is None: portdir = portage_settings().repositories[repo].location @@ -444,7 +446,7 @@ def ignorable_arg(arg, quiet=0): return False -def args_to_work(args, arch_status=None, _repo='gentoo', quiet=0): +def args_to_work(args, arch_status=None, _repo=None, quiet=0): """Process |args| into a list of work itmes (ebuild/arches to update)""" work = [] todo_arches = []