From 97229033a419f703d8e16c56357afaf0c3326b7d Mon Sep 17 00:00:00 2001 From: Arkadiusz Bokowy Date: Thu, 27 Jun 2024 16:06:35 +0200 Subject: [PATCH] Cast _download_suffix to str before concatenation If the `_download_suffix` was not loaded before, the concatenate operation will fail with `TypError` exception: Traceback (most recent call last): File "/tmp/main.py", line 90, in depgraph.display_problems() File "/home/arkq/.local/lib/python3.10/site-packages/_emerge/depgraph.py", line 10756, in display_problems self._show_circular_deps(self._dynamic_config._circular_deps_for_display) File "/home/arkq/.local/lib/python3.10/site-packages/_emerge/depgraph.py", line 10075, in _show_circular_deps self.display(handler.merge_list) File "/home/arkq/.local/lib/python3.10/site-packages/_emerge/depgraph.py", line 10263, in display return display(self, mylist, favorites, verbosity) File "/home/arkq/.local/lib/python3.10/site-packages/_emerge/resolver/output.py", line 863, in __call__ self.verbose_size(pkg, None, pkg_info) File "/home/arkq/.local/lib/python3.10/site-packages/_emerge/resolver/output.py", line 318, in verbose_size myfilesdict = db.getfetchsizes(pkg.cpv, **kwargs) File "/home/arkq/.local/lib/python3.10/site-packages/portage/dbapi/porttree.py", line 1012, in getfetchsizes mystat = os.stat(file_path + _download_suffix) TypeError: can only concatenate str (not "_LazyImportFrom") to str Signed-off-by: Arkadiusz Bokowy --- lib/portage/dbapi/porttree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py index 5a4d69f372..6431e5bf85 100644 --- a/lib/portage/dbapi/porttree.py +++ b/lib/portage/dbapi/porttree.py @@ -1009,7 +1009,7 @@ def getfetchsizes(self, mypkg, useflags=None, debug=0, myrepo=None): if mystat is None: try: - mystat = os.stat(file_path + _download_suffix) + mystat = os.stat(file_path + str(_download_suffix)) except OSError: pass