aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBerin Aniesh <berinaniesh@gmail.com>2023-06-18 09:11:12 +0530
committerSam James <sam@gentoo.org>2023-06-29 09:19:27 +0100
commit5de6c63d0779eee0942a294b3a53ee1cce9d6d07 (patch)
treebd71a620999092a7daf3a34d9023226546151d3a
parentportage: dep: A few type annotations (diff)
downloadportage-5de6c63d.tar.gz
portage-5de6c63d.tar.bz2
portage-5de6c63d.zip
actions.py: refactor getportageversion() into smaller functions
Signed-off-by: Berin Aniesh <berinaniesh@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--lib/_emerge/actions.py51
1 files changed, 29 insertions, 22 deletions
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index 60199dae6..dae6b6b7b 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -2789,16 +2789,23 @@ def relative_profile_path(portdir, abs_profile):
profilever = None
return profilever
+def get_libc_version(vardb):
+ libcver = []
+ libclist = set()
+ for atom in expand_new_virt(vardb, portage.const.LIBC_PACKAGE_ATOM):
+ if not atom.blocker:
+ libclist.update(vardb.match(atom))
+ if libclist:
+ for cpv in sorted(libclist):
+ libc_split = portage.catpkgsplit(cpv)[1:]
+ if libc_split[-1] == "r0":
+ libc_split = libc_split[:-1]
+ libcver.append("-".join(libc_split))
+ else:
+ libcver = ["unavailable"]
+ return libcver
-def getportageversion(portdir, _unused, profile, chost, vardb):
- pythonver = (
- "python"
- f" {sys.version_info[0]}"
- f".{sys.version_info[1]}"
- f".{sys.version_info[2]}"
- f"-{sys.version_info[3]}"
- f"-{sys.version_info[4]}"
- )
+def get_profile_version(portdir, profile, vardb):
profilever = None
repositories = vardb.settings.repositories
if profile:
@@ -2838,21 +2845,21 @@ def getportageversion(portdir, _unused, profile, chost, vardb):
if profilever is None:
profilever = "unavailable"
+
+ return profilever
- libcver = []
- libclist = set()
- for atom in expand_new_virt(vardb, portage.const.LIBC_PACKAGE_ATOM):
- if not atom.blocker:
- libclist.update(vardb.match(atom))
- if libclist:
- for cpv in sorted(libclist):
- libc_split = portage.catpkgsplit(cpv)[1:]
- if libc_split[-1] == "r0":
- libc_split = libc_split[:-1]
- libcver.append("-".join(libc_split))
- else:
- libcver = ["unavailable"]
+def getportageversion(portdir, _unused, profile, chost, vardb):
+ pythonver = (
+ "python"
+ f" {sys.version_info[0]}"
+ f".{sys.version_info[1]}"
+ f".{sys.version_info[2]}"
+ f"-{sys.version_info[3]}"
+ f"-{sys.version_info[4]}"
+ )
+ profilever = get_profile_version(portdir, profile, vardb)
+ libcver = get_libc_version(vardb)
gccver = getgccversion(chost)
unameout = platform.release() + " " + platform.machine()