1 |
abcd 10/12/31 21:51:41 |
2 |
|
3 |
Modified: python.eclass |
4 |
Log: |
5 |
Fix handling of EPREFIX in python_merge_intermediate_installation_images() |
6 |
|
7 |
Revision Changes Path |
8 |
1.108 eclass/python.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.108&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.108&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.107&r2=1.108 |
13 |
|
14 |
Index: python.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v |
17 |
retrieving revision 1.107 |
18 |
retrieving revision 1.108 |
19 |
diff -u -r1.107 -r1.108 |
20 |
--- python.eclass 26 Dec 2010 11:30:27 -0000 1.107 |
21 |
+++ python.eclass 31 Dec 2010 21:51:41 -0000 1.108 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2010 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.107 2010/12/26 11:30:27 arfrever Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.108 2010/12/31 21:51:41 abcd Exp $ |
27 |
|
28 |
# @ECLASS: python.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -1449,7 +1449,7 @@ |
31 |
|
32 |
popd > /dev/null || die "popd failed" |
33 |
|
34 |
- 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" |
35 |
+ 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" |
36 |
done |
37 |
|
38 |
rm -fr "${intermediate_installation_images_directory}" |