| 1 |
nelchael 12/04/30 09:51:00 |
| 2 |
|
| 3 |
Modified: python-distutils-ng.eclass ChangeLog |
| 4 |
Log: |
| 5 |
Remove die from eclass, simply warn if user has collision-protect enabled. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.13 eclass/python-distutils-ng.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-distutils-ng.eclass?rev=1.13&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-distutils-ng.eclass?rev=1.13&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-distutils-ng.eclass?r1=1.12&r2=1.13 |
| 13 |
|
| 14 |
Index: python-distutils-ng.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v |
| 17 |
retrieving revision 1.12 |
| 18 |
retrieving revision 1.13 |
| 19 |
diff -u -r1.12 -r1.13 |
| 20 |
--- python-distutils-ng.eclass 30 Apr 2012 08:25:31 -0000 1.12 |
| 21 |
+++ python-distutils-ng.eclass 30 Apr 2012 09:51:00 -0000 1.13 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.12 2012/04/30 08:25:31 nelchael Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.13 2012/04/30 09:51:00 nelchael Exp $ |
| 27 |
|
| 28 |
# @ECLASS: python-distutils-ng |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -304,11 +304,10 @@ |
| 31 |
# Phase function: pkg_pretend |
| 32 |
python-distutils-ng_pkg_pretend() { |
| 33 |
if has "collision-protect" ${FEATURES}; then |
| 34 |
- eerror "Due to previous eclass compiling Python files outside of src_install" |
| 35 |
- eerror "(and not recording resulting .pyc and .pyo files as owned by any package)" |
| 36 |
- eerror "merging this package with \"collision-protect\" in FEATURES will result" |
| 37 |
- eerror "in an error, please switch to using \"protect-owned\" instead." |
| 38 |
- die "\"collision-protect\" in FEATURES detected" |
| 39 |
+ ewarn "Due to previous eclass compiling Python files outside of src_install" |
| 40 |
+ ewarn "(and not recording resulting .pyc and .pyo files as owned by any package)" |
| 41 |
+ ewarn "merging this package with \"collision-protect\" in FEATURES may result" |
| 42 |
+ ewarn "in an error, please switch to using \"protect-owned\" instead." |
| 43 |
fi |
| 44 |
} |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.230 eclass/ChangeLog |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.230&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.230&content-type=text/plain |
| 53 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.229&r2=1.230 |
| 54 |
|
| 55 |
Index: ChangeLog |
| 56 |
=================================================================== |
| 57 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 58 |
retrieving revision 1.229 |
| 59 |
retrieving revision 1.230 |
| 60 |
diff -u -r1.229 -r1.230 |
| 61 |
--- ChangeLog 30 Apr 2012 08:25:31 -0000 1.229 |
| 62 |
+++ ChangeLog 30 Apr 2012 09:51:00 -0000 1.230 |
| 63 |
@@ -1,6 +1,10 @@ |
| 64 |
# ChangeLog for eclass directory |
| 65 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.229 2012/04/30 08:25:31 nelchael Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.230 2012/04/30 09:51:00 nelchael Exp $ |
| 68 |
+ |
| 69 |
+ 30 Apr 2012; Krzysztof Pawlik <nelchael@g.o> |
| 70 |
+ python-distutils-ng.eclass: |
| 71 |
+ Remove die from eclass, simply warn if user has collision-protect enabled. |
| 72 |
|
| 73 |
30 Apr 2012; Krzysztof Pawlik <nelchael@g.o> |
| 74 |
python-distutils-ng.eclass: |
Archives