commit: 5de6c63d0779eee0942a294b3a53ee1cce9d6d07
Author: Berin Aniesh <berinaniesh <AT> gmail <DOT> com>
AuthorDate: Sun Jun 18 03:41:12 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 29 08:19:27 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5de6c63d
actions.py: refactor getportageversion() into smaller functions
Signed-off-by: Berin Aniesh <berinaniesh <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/_emerge/actions.py | 51 ++++++++++++++++++++++++++++----------------------
1 file 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()
