commit: b3f1594699a1035fb26be6948cb14027e578a6a0
Author: Brian Harring <ferringb <AT> gmail <DOT> com>
AuthorDate: Wed Jan 21 19:33:57 2026 +0000
Commit: Brian Harring <ferringb <AT> gmail <DOT> com>
CommitDate: Wed Jan 21 22:25:53 2026 +0000
URL:
https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=b3f15946
remove constant.CP_BINARY, long since irrelevant
Signed-off-by: Brian Harring <ferringb <AT> gmail.com>
src/pkgcore/const.py | 3 +--
src/pkgcore/fs/ops.py | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/pkgcore/const.py b/src/pkgcore/const.py
index 59b27311..02e008dc 100644
--- a/src/pkgcore/const.py
+++ b/src/pkgcore/const.py
@@ -5,7 +5,7 @@ Internal constants.
import os
import sys
-from snakeoil import mappings, process
+from snakeoil import mappings
from . import __title__
@@ -58,4 +58,3 @@ LIBDIR_PATH = _GET_CONST("LIBDIR_PATH",
"%(REPO_PATH)s/data/lib/pkgcore")
EBD_PATH = _GET_CONST("EBD_PATH", "%(LIBDIR_PATH)s/ebd")
CONFIG_PATH = _GET_CONST("CONFIG_PATH", "%(DATA_PATH)s/config")
PATH_FORCED_PREPEND = _GET_CONST("INJECTED_BIN_PATH", ("%(REPO_PATH)s/bin",))
-CP_BINARY = process.find_binary("cp", fallback="/bin/cp")
diff --git a/src/pkgcore/fs/ops.py b/src/pkgcore/fs/ops.py
index a305253c..464b84bb 100644
--- a/src/pkgcore/fs/ops.py
+++ b/src/pkgcore/fs/ops.py
@@ -13,7 +13,6 @@ from os.path import join as pjoin
from snakeoil.osutils import ensure_dirs, unlink_if_exists
from snakeoil.process.spawn import spawn
-from ..const import CP_BINARY
from . import contents, fs
from .livefs import gen_obj
@@ -152,9 +151,9 @@ def copyfile(obj, mkdirs=False):
dev = os.makedev(obj.major, obj.minor)
os.mknod(fp, obj.mode, dev)
else:
- ret = spawn([CP_BINARY, "-Rp", obj.location, fp])
+ ret = spawn(["cp", "-Rp", obj.location, fp])
if ret != 0:
- raise FailedCopy(obj, f"got {ret} from {CP_BINARY} -Rp")
+ raise FailedCopy(obj, f"got {ret} from cp -Rp")
ensure_perms(obj.change_attributes(location=fp))
