Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 12 Dec 2015 12:59:15
Message-Id: 1449925137.dd267937f5dbfbe6d353ffb95ac5f0dafde533fa.mgorny@gentoo
1 commit: dd267937f5dbfbe6d353ffb95ac5f0dafde533fa
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 12 12:40:41 2015 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 12 12:58:57 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd267937
7
8 python.eclass: Remove outdated/broken sanity checks
9
10 eclass/python.eclass | 14 +-------------
11 1 file changed, 1 insertion(+), 13 deletions(-)
12
13 diff --git a/eclass/python.eclass b/eclass/python.eclass
14 index 592119f..7627214 100644
15 --- a/eclass/python.eclass
16 +++ b/eclass/python.eclass
17 @@ -345,19 +345,7 @@ _python_initialize_prefix_variables() {
18 unset PYTHON_SANITY_CHECKS_EXECUTED PYTHON_SKIP_SANITY_CHECKS
19
20 _python_initial_sanity_checks() {
21 - if [[ "$(declare -p PYTHON_SANITY_CHECKS_EXECUTED 2> /dev/null)" != "declare -- PYTHON_SANITY_CHECKS_EXECUTED="* || " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " && -z "${PYTHON_SKIP_SANITY_CHECKS}" ]]; then
22 - # Ensure that /usr/bin/python and /usr/bin/python-config are valid.
23 - if [[ "$(readlink "${EPREFIX}/usr/bin/python")" != "python-wrapper" ]]; then
24 - eerror "'${EPREFIX}/usr/bin/python' is not a valid symlink."
25 - eerror "Use \`eselect python set \${python_interpreter}\` to fix this problem."
26 - die "'${EPREFIX}/usr/bin/python' is not a valid symlink"
27 - fi
28 - if [[ "$(<"${EPREFIX}/usr/bin/python-config")" != *"Gentoo python-config wrapper script"* ]]; then
29 - eerror "'${EPREFIX}/usr/bin/python-config' is not a valid script"
30 - eerror "Use \`eselect python set \${python_interpreter}\` to fix this problem."
31 - die "'${EPREFIX}/usr/bin/python-config' is not a valid script"
32 - fi
33 - fi
34 + :
35 }
36
37 _python_final_sanity_checks() {