mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 15:11:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

overlay coreos/user-patches: Refresh patch for app-portage/gentoolkit

Browse Source
This commit is contained in:
Krzesimir Nowak 2023-07-06 06:57:28 +02:00
parent 6524396422
commit a2e2ffea16
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/0001-profile-Default-to-main-repo-name.patch vendored
View File

@ -1,4 +1,4 @@
From e40cd8c76bee4f7c108c1066d60aaf5d8c3adede Mon Sep 17 00:00:00 2001 From b8396c72055ecc90b1a0e824b517a50cee9a843c Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com> From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 8 Dec 2022 16:25:39 +0100 Date: Thu, 8 Dec 2022 16:25:39 +0100
Subject: [PATCH] profile: Default to main repo name Subject: [PATCH] profile: Default to main repo name
@ -11,42 +11,44 @@ Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
Closes: https://github.com/gentoo/gentoolkit/pull/24 Closes: https://github.com/gentoo/gentoolkit/pull/24
Signed-off-by: Sam James <sam@gentoo.org> Signed-off-by: Sam James <sam@gentoo.org>
--- ---
pym/gentoolkit/profile.py | 13 ++++++++++--- pym/gentoolkit/profile.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 3 deletions(-) 1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/pym/gentoolkit/profile.py b/pym/gentoolkit/profile.py diff --git a/pym/gentoolkit/profile.py b/pym/gentoolkit/profile.py
index dcd02cc..c880137 100644 index f6943be..7469138 100644
--- a/pym/gentoolkit/profile.py --- a/pym/gentoolkit/profile.py
+++ b/pym/gentoolkit/profile.py +++ b/pym/gentoolkit/profile.py
@@ -23,19 +23,26 @@ def warning(msg): @@ -21,21 +21,26 @@ def warning(msg):
print('warning: %s' % msg, file=sys.stderr) print("warning: %s" % msg, file=sys.stderr)
-def load_profile_data(portdir=None, repo='gentoo'): -def load_profile_data(portdir=None, repo="gentoo"):
+def load_profile_data(portdir=None, repo=''): +def load_profile_data(portdir=None, repo=""):
"""Load the list of known arches from the tree """Load the list of known arches from the tree
Args: Args:
portdir: The repository to load all data from (and ignore |repo|) portdir: The repository to load all data from (and ignore |repo|)
- repo: Look up this repository by name to locate profile data - repo: Look up this repository by name to locate profile data
+ repo: Look up this repository by name to locate profile data (if empty, uses main repo name) + repo: Look up this repository by name to locate profile data (if empty, uses main repo name)
Returns: Returns:
A dict mapping the keyword to its preferred state: A dict mapping the keyword to its preferred state:
{'x86': ('stable', 'arch'), 'mips': ('dev', '~arch'), ...} {'x86': ('stable', 'arch'), 'mips': ('dev', '~arch'), ...}
""" """
if portdir is None: if portdir is None:
- portdir = portage.db[portage.root]['vartree'].settings.repositories[repo].location - portdir = (
+ repos = portage.db[portage.root]["vartree"].settings.repositories - portage.db[portage.root]["vartree"].settings.repositories[repo].location
+ if repo == "": - )
+ main_repo = repos.mainRepo() + repos = portage.db[portage.root]["vartree"].settings.repositories
+ if main_repo is None: + if repo == "":
+ repo = "gentoo" + main_repo = repos.mainRepo()
+ else: + if main_repo is None:
+ repo = main_repo.name + repo = "gentoo"
+ portdir = repos[repo].location + else:
+ repo = main_repo.name
+ portdir = repos[repo].location
arch_status = {} arch_status = {}
-- --
2.25.1 2.25.1