commit: 5ee1a193982fce006aefbd5a6c5907392016b44d Author: mid-kid <esteve.varela <AT> gmail <DOT> com> AuthorDate: Sat Aug 3 15:04:43 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Aug 15 17:29:00 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5ee1a193
Make portage.util.compression_probe work when ctypes is unavailable This is useful for bootstrapping purposes, as _ctypes requires a dynamic linker. Closes: https://github.com/gentoo/portage/pull/1363 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> lib/portage/util/compression_probe.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/portage/util/compression_probe.py b/lib/portage/util/compression_probe.py index 0879754b21..268e5840cc 100644 --- a/lib/portage/util/compression_probe.py +++ b/lib/portage/util/compression_probe.py @@ -1,13 +1,13 @@ # Copyright 2015-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -import ctypes import errno import re from portage import _encodings, _unicode_encode from portage.exception import FileNotFound, PermissionDenied +from portage.util._ctypes import ctypes _compressors = { "bzip2": { @@ -49,7 +49,7 @@ _compressors = { # if the current architecture can support it, which is true when # sizeof(long) is at least 8 bytes. "decompress": "zstd -d" - + (" --long=31" if ctypes.sizeof(ctypes.c_long) >= 8 else ""), + + (" --long=31" if ctypes and ctypes.sizeof(ctypes.c_long) >= 8 else ""), "package": "app-arch/zstd", }, }
