diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-10-26 09:28:44 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-10-26 09:28:44 +0000 |
| commit | bf32af1a77904f06af121d4129d76a493e9f1fd0 (patch) | |
| tree | 8a826a570be8b021540c7127348ff6c4cbbe7405 /dev-python/k5test | |
| parent | ec183e1c90a17c119012450982f07aa5a19ece65 (diff) | |
| download | baldeagleos-repo-bf32af1a77904f06af121d4129d76a493e9f1fd0.tar.gz baldeagleos-repo-bf32af1a77904f06af121d4129d76a493e9f1fd0.tar.xz baldeagleos-repo-bf32af1a77904f06af121d4129d76a493e9f1fd0.zip | |
Adding metadata
Diffstat (limited to 'dev-python/k5test')
| -rw-r--r-- | dev-python/k5test/files/k5test-0.10.1-which.patch | 41 | ||||
| -rw-r--r-- | dev-python/k5test/k5test-0.10.1-r2.ebuild (renamed from dev-python/k5test/k5test-0.10.1-r1.ebuild) | 12 |
2 files changed, 51 insertions, 2 deletions
diff --git a/dev-python/k5test/files/k5test-0.10.1-which.patch b/dev-python/k5test/files/k5test-0.10.1-which.patch new file mode 100644 index 000000000000..c5a72b5dc091 --- /dev/null +++ b/dev-python/k5test/files/k5test-0.10.1-which.patch @@ -0,0 +1,41 @@ +From cff2138124cb7461fe2b1a270d0c0132e6f66f6b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 26 Oct 2022 05:31:22 +0200 +Subject: [PATCH] Use built-in shutil.which() instead of which(1) tool + +Use the built-in shutil.which() function that is available since Python +3.3 instead of the external which(1) program. The latter is not part +of POSIX and may be missing entirely (Gentoo is activately working +towards removing it)> +--- + k5test/realm.py | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/k5test/realm.py b/k5test/realm.py +index 8b24141..2260258 100644 +--- a/k5test/realm.py ++++ b/k5test/realm.py +@@ -68,16 +68,13 @@ def _cfg_merge(cfg1, cfg2): + + + def _discover_path(name, default, paths): +- stderr_out = subprocess.DEVNULL +- try: +- path = subprocess.check_output(["which", name], stderr=stderr_out).strip() +- path = path.decode(sys.getfilesystemencoding() or sys.getdefaultencoding()) ++ path = shutil.which(name) ++ if path is not None: + _LOG.debug(f"Using discovered path for {name} ({path})") +- return path +- except subprocess.CalledProcessError as e: ++ else: + path = paths.get(name, default) + _LOG.debug(f"Using default path for {name} ({path}): {e}") +- return path ++ return path + + + class K5Realm(metaclass=abc.ABCMeta): +-- +2.38.1 + diff --git a/dev-python/k5test/k5test-0.10.1-r1.ebuild b/dev-python/k5test/k5test-0.10.1-r2.ebuild index 2cad82caf29f..433765ef2603 100644 --- a/dev-python/k5test/k5test-0.10.1-r1.ebuild +++ b/dev-python/k5test/k5test-0.10.1-r2.ebuild @@ -4,13 +4,21 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) + inherit distutils-r1 DESCRIPTION="Library for testing Python applications in Kerberos 5 environments" -HOMEPAGE="https://pypi.org/project/k5test/ https://github.com/pythongssapi/k5test" +HOMEPAGE=" + https://github.com/pythongssapi/k5test/ + https://pypi.org/project/k5test/ +" SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~arm arm64 ~riscv x86" + +PATCHES=( + "${FILESDIR}"/${P}-which.patch +) |
