summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2019-10-24 17:05:35 +0200
committerMichael Haubenwallner <haubi@gentoo.org>2019-10-24 17:05:56 +0200
commit8d941d9c0e77eaab787df5f19ab97ca8a2fd6cff (patch)
tree9a927f2acb11c8ec69b51410203cd9da8e75c26f
parentf2278785d6833e3e3358cd847280e9c9107f303e (diff)
downloadgentoolkit-8d941d9c0e77eaab787df5f19ab97ca8a2fd6cff.tar.gz
ekeyword: fix for when main-repo != "gentoo"
Closes: https://bugs.gentoo.org/698256 Signed-off-by: Michael Haubenwallner <haubi@gentoo.org>
-rwxr-xr-xpym/gentoolkit/ekeyword/ekeyword.py6
1 files 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 = []