1 |
On 22:19 Wed 23 Jan , Ali Polatel (hawking) wrote: |
2 |
> hawking 08/01/23 22:19:05 |
3 |
> |
4 |
> Modified: distutils.eclass |
5 |
> Log: |
6 |
> Fixed ROOT usage for distutils_pkg_postinst failing when ROOT ends with slash |
7 |
|
8 |
> @@ -99,11 +99,14 @@ |
9 |
> distutils_pkg_postinst() { |
10 |
> PYTHON_MODNAME=${PYTHON_MODNAME:-${PN}} |
11 |
> |
12 |
> + # strip trailing slash |
13 |
> + myroot="${ROOT%/}" |
14 |
> + |
15 |
> if has_version ">=dev-lang/python-2.3"; then |
16 |
> python_version |
17 |
> for pymod in ${PYTHON_MODNAME}; do |
18 |
> - if [ -d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}" ]; then |
19 |
> - python_mod_optimize ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${pymod} |
20 |
> + if [ -d "${myroot}/usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}" ]; then |
21 |
> + python_mod_optimize ${myroot}/usr/$(get_libdir)/python${PYVER}/site-packages/${pymod} |
22 |
> fi |
23 |
> done |
24 |
> fi |
25 |
|
26 |
Seems like this might be better fixed by properly handling ROOT in |
27 |
python.eclass instead of hacking around it. |
28 |
|
29 |
Thanks, |
30 |
Donnie |
31 |
-- |
32 |
gentoo-dev@l.g.o mailing list |