mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-07 05:57:07 -08:00
python-utils-r1.eclass: stop respecting DESTTREE in python_do*/new*
Replace the code respecting current value of ${DESTTREE} in favor of
using /usr unconditionally. The feature was extremely unlikely to be
ever used (only if you did 'into ...; python_do*', quite confusing
and relied on semi-internal package manager variables.
Furthermore, it was potentially broken as it relied on DESTTREE having
an initial '/usr' value which is not warranted by the PMS.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
@@ -657,7 +657,7 @@ python_optimize() {
|
||||
# The current script destination for python_doscript(). The path
|
||||
# is relative to the installation root (${ED}).
|
||||
#
|
||||
# When unset, ${DESTTREE}/bin (/usr/bin by default) will be used.
|
||||
# When unset, /usr/bin will be used.
|
||||
#
|
||||
# Can be set indirectly through the python_scriptinto() function.
|
||||
#
|
||||
@@ -718,7 +718,7 @@ python_newexe() {
|
||||
die "python_do* and python_new* helpers are banned in EAPIs older than 4."
|
||||
fi
|
||||
|
||||
local wrapd=${python_scriptroot:-${DESTTREE}/bin}
|
||||
local wrapd=${python_scriptroot:-/usr/bin}
|
||||
|
||||
local f=${1}
|
||||
local newfn=${2}
|
||||
|
||||
Reference in New Issue
Block a user