diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2010-12-31 21:51:41 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2010-12-31 21:51:41 +0000 |
| commit | 0ab45b3d64ca4d2e509d866cdbda2015fd0f0cb1 (patch) | |
| tree | 1a76d0ba5e8e3bf7fa63b2f24c26071a395e32e6 /eclass | |
| parent | Fix building with Jython. (diff) | |
| download | gentoo-2-0ab45b3d64ca4d2e509d866cdbda2015fd0f0cb1.tar.gz gentoo-2-0ab45b3d64ca4d2e509d866cdbda2015fd0f0cb1.tar.bz2 gentoo-2-0ab45b3d64ca4d2e509d866cdbda2015fd0f0cb1.zip | |
Fix handling of EPREFIX in python_merge_intermediate_installation_images()
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/python.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/python.eclass b/eclass/python.eclass index e24b42560ef1..0ac20b7a76b1 100644 --- a/eclass/python.eclass +++ b/eclass/python.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.107 2010/12/26 11:30:27 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.108 2010/12/31 21:51:41 abcd Exp $ # @ECLASS: python.eclass # @MAINTAINER: @@ -1449,7 +1449,7 @@ for file in sorted(files_set): popd > /dev/null || die "popd failed" - cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${ED}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" + cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" done rm -fr "${intermediate_installation_images_directory}" |