commit: 5fa94917c22de6208b8b7f2a51f0d1e59b9b6244
Author: Berin Aniesh <berinaniesh <AT> gmail <DOT> com>
AuthorDate: Sun Jun 18 03:46:32 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 29 08:19:28 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5fa94917
actions.py: getportageversion() change .format to f string
portage.dep.py: run black
Signed-off-by: Berin Aniesh <berinaniesh <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/_emerge/actions.py | 14 +++++---------
lib/portage/dep/__init__.py | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index dae6b6b7b..01bf82fcb 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -2789,6 +2789,7 @@ def relative_profile_path(portdir, abs_profile):
profilever = None
return profilever
+
def get_libc_version(vardb):
libcver = []
libclist = set()
@@ -2805,6 +2806,7 @@ def get_libc_version(vardb):
libcver = ["unavailable"]
return libcver
+
def get_profile_version(portdir, profile, vardb):
profilever = None
repositories = vardb.settings.repositories
@@ -2845,9 +2847,10 @@ def get_profile_version(portdir, profile, vardb):
if profilever is None:
profilever = "unavailable"
-
+
return profilever
+
def getportageversion(portdir, _unused, profile, chost, vardb):
pythonver = (
"python"
@@ -2863,14 +2866,7 @@ def getportageversion(portdir, _unused, profile, chost,
vardb):
gccver = getgccversion(chost)
unameout = platform.release() + " " + platform.machine()
- return "Portage {} ({}, {}, {}, {}, {})".format(
- portage.VERSION,
- pythonver,
- profilever,
- gccver,
- ",".join(libcver),
- unameout,
- )
+ return f"Portage {portage.VERSION} ({pythonver}, {profilever}, {gccver},
{','.join(libcver)}, {unameout})"
class _emerge_config(SlotObject):
diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index b196dd340..7bdb8da76 100644
--- a/lib/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
@@ -100,7 +100,7 @@ def _get_slot_dep_re(eapi_attrs: portage.eapi._eapi_attrs)
-> re.Pattern:
def _match_slot(atom, pkg) -> bool:
"""
@type atom: portage.dep.Atom
- @type pkg: _emerge.Package.Package
+ @type pkg: _emerge.Package.Package
"""
if pkg.slot == atom.slot:
if not atom.sub_slot:
