From: "Michael Haubenwallner" <haubi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/ekeyword/
Date: Thu, 24 Oct 2019 15:07:31 +0000 (UTC) [thread overview]
Message-ID: <1571929556.8d941d9c0e77eaab787df5f19ab97ca8a2fd6cff.haubi@gentoo> (raw)
commit: 8d941d9c0e77eaab787df5f19ab97ca8a2fd6cff
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 15:05:35 2019 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> 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 <haubi <AT> 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 = []
next reply other threads:[~2019-10-24 15:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 15:07 Michael Haubenwallner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-24 18:05 [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/ekeyword/ Matt Turner
2022-07-09 19:50 Brian Dolbec
2021-06-18 14:03 Sam James
2020-12-28 18:01 Matt Turner
2020-12-28 17:52 Matt Turner
2020-12-28 17:52 Matt Turner
2020-04-24 8:06 Michał Górny
2019-10-24 15:07 Michael Haubenwallner
2017-09-11 20:20 Sebastian Pipping
2017-03-22 12:51 Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1571929556.8d941d9c0e77eaab787df5f19ab97ca8a2fd6cff.haubi@gentoo \
--to=haubi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox