summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-05-14 08:24:29 +0200
committerMichał Górny <mgorny@gentoo.org>2016-05-14 09:19:57 +0200
commitab2b94cf3829ca1ac580c1ca281c0437bded709b (patch)
tree8c7602529fb41c9af5cdf1f1a06ca33345d4f882 /eclass/python-utils-r1.eclass
parentdistutils-r1.eclass: Do not rely on INSDESTTREE, #173630 (diff)
downloadgentoo-ab2b94cf3829ca1ac580c1ca281c0437bded709b.tar.gz
gentoo-ab2b94cf3829ca1ac580c1ca281c0437bded709b.tar.bz2
gentoo-ab2b94cf3829ca1ac580c1ca281c0437bded709b.zip
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.
Diffstat (limited to 'eclass/python-utils-r1.eclass')
-rw-r--r--eclass/python-utils-r1.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 9488966a994..3f9563a8857 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -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}