summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-05-03 00:31:58 +0000
committerMike Gilbert <floppym@gentoo.org>2012-05-03 00:31:58 +0000
commit7a2445132846b80987be3b03b6c372b861a205cf (patch)
treedf7b70115ba24a6f70353f57b77877d7f92f5afc /eclass
parentMigrate to virtual/pkgconfig. (diff)
downloadgentoo-2-7a2445132846b80987be3b03b6c372b861a205cf.tar.gz
gentoo-2-7a2445132846b80987be3b03b6c372b861a205cf.tar.bz2
gentoo-2-7a2445132846b80987be3b03b6c372b861a205cf.zip
Declare local S in _python-distutils-ng_run_for_impl.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/python-distutils-ng.eclass5
2 files changed, 6 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 9837b300de25..3178130ba387 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.234 2012/05/02 21:40:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.235 2012/05/03 00:31:58 floppym Exp $
+
+ 03 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
+ Declare local S in _python-distutils-ng_run_for_impl.
02 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
Fix bytecode generation with Python 3, bug 413771. Patch by James Rowe.
diff --git a/eclass/python-distutils-ng.eclass b/eclass/python-distutils-ng.eclass
index 72541207a5cd..9474d54dd387 100644
--- a/eclass/python-distutils-ng.eclass
+++ b/eclass/python-distutils-ng.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.14 2012/05/02 21:40:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.15 2012/05/03 00:31:58 floppym Exp $
# @ECLASS: python-distutils-ng
# @MAINTAINER:
@@ -134,7 +134,7 @@ _python-distutils-ng_run_for_impl() {
local impl="${1}"
local command="${2}"
- S="${WORKDIR}/impl_${impl}/${_PACKAGE_SPECIFIC_S}"
+ local S="${WORKDIR}/impl_${impl}/${_PACKAGE_SPECIFIC_S}"
PYTHON="$(_python-distutils-ng_get_binary_for_implementation "${impl}")"
EPYTHON="${impl/_/.}"
@@ -384,7 +384,6 @@ python-distutils-ng_src_install() {
_python-distutils-ng_default_distutils_install
fi
- S="${WORKDIR}/${_PACKAGE_SPECIFIC_S}"
if type python_install_all &> /dev/null; then
einfo "Running python_install_all in ${S} for all"
pushd "${S}" &> /dev/null