| 1 |
vapier 14/02/06 05:34:08 |
| 2 |
|
| 3 |
Modified: python.eclass |
| 4 |
Log: |
| 5 |
minor grammar fixes |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.169 eclass/python.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.169&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.169&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.168&r2=1.169 |
| 13 |
|
| 14 |
Index: python.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v |
| 17 |
retrieving revision 1.168 |
| 18 |
retrieving revision 1.169 |
| 19 |
diff -u -r1.168 -r1.169 |
| 20 |
--- python.eclass 18 Sep 2013 18:47:59 -0000 1.168 |
| 21 |
+++ python.eclass 6 Feb 2014 05:34:07 -0000 1.169 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.168 2013/09/18 18:47:59 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.169 2014/02/06 05:34:07 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: python.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -341,14 +341,14 @@ |
| 31 |
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 |
| 32 |
# Ensure that /usr/bin/python and /usr/bin/python-config are valid. |
| 33 |
if [[ "$(readlink "${EPREFIX}/usr/bin/python")" != "python-wrapper" ]]; then |
| 34 |
- eerror "'${EPREFIX}/usr/bin/python' is not valid symlink." |
| 35 |
+ eerror "'${EPREFIX}/usr/bin/python' is not a valid symlink." |
| 36 |
eerror "Use \`eselect python set \${python_interpreter}\` to fix this problem." |
| 37 |
- die "'${EPREFIX}/usr/bin/python' is not valid symlink" |
| 38 |
+ die "'${EPREFIX}/usr/bin/python' is not a valid symlink" |
| 39 |
fi |
| 40 |
if [[ "$(<"${EPREFIX}/usr/bin/python-config")" != *"Gentoo python-config wrapper script"* ]]; then |
| 41 |
- eerror "'${EPREFIX}/usr/bin/python-config' is not valid script" |
| 42 |
+ eerror "'${EPREFIX}/usr/bin/python-config' is not a valid script" |
| 43 |
eerror "Use \`eselect python set \${python_interpreter}\` to fix this problem." |
| 44 |
- die "'${EPREFIX}/usr/bin/python-config' is not valid script" |
| 45 |
+ die "'${EPREFIX}/usr/bin/python-config' is not a valid script" |
| 46 |
fi |
| 47 |
fi |
| 48 |
} |
| 49 |
@@ -802,7 +802,7 @@ |
| 50 |
|
| 51 |
if has_version "=dev-lang/python-2*"; then |
| 52 |
if [[ "$(readlink "${EPREFIX}/usr/bin/python2")" != "python2."* ]]; then |
| 53 |
- die "'${EPREFIX}/usr/bin/python2' is not valid symlink" |
| 54 |
+ die "'${EPREFIX}/usr/bin/python2' is not a valid symlink" |
| 55 |
fi |
| 56 |
|
| 57 |
python2_version="$("${EPREFIX}/usr/bin/python2" -c 'from sys import version_info; print(".".join(str(x) for x in version_info[:2]))')" |
| 58 |
@@ -825,7 +825,7 @@ |
| 59 |
|
| 60 |
if has_version "=dev-lang/python-3*"; then |
| 61 |
if [[ "$(readlink "${EPREFIX}/usr/bin/python3")" != "python3."* ]]; then |
| 62 |
- die "'${EPREFIX}/usr/bin/python3' is not valid symlink" |
| 63 |
+ die "'${EPREFIX}/usr/bin/python3' is not a valid symlink" |
| 64 |
fi |
| 65 |
|
| 66 |
python3_version="$("${EPREFIX}/usr/bin/python3" -c 'from sys import version_info; print(".".join(str(x) for x in version_info[:2]))')" |
Archives