diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2012-04-30 09:51:00 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2012-04-30 09:51:00 +0000 |
| commit | e35427db52fad669a3135741719405c82ed6aad1 (patch) | |
| tree | a53755ee9ade0f09b621f84e2a9a17f1d4c31792 /eclass | |
| parent | Stable for amd64, wrt bug #413931 (diff) | |
| download | historical-e35427db52fad669a3135741719405c82ed6aad1.tar.gz historical-e35427db52fad669a3135741719405c82ed6aad1.tar.bz2 historical-e35427db52fad669a3135741719405c82ed6aad1.zip | |
Remove die from eclass, simply warn if user has collision-protect enabled.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/python-distutils-ng.eclass | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 30a2082910bc..15c97f5884eb 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.229 2012/04/30 08:25:31 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.230 2012/04/30 09:51:00 nelchael Exp $ + + 30 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org> + python-distutils-ng.eclass: + Remove die from eclass, simply warn if user has collision-protect enabled. 30 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org> python-distutils-ng.eclass: diff --git a/eclass/python-distutils-ng.eclass b/eclass/python-distutils-ng.eclass index f115343fd32d..de22bb0c9d63 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.12 2012/04/30 08:25:31 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.13 2012/04/30 09:51:00 nelchael Exp $ # @ECLASS: python-distutils-ng # @MAINTAINER: @@ -304,11 +304,10 @@ python-distutils-ng_newscript() { # Phase function: pkg_pretend python-distutils-ng_pkg_pretend() { if has "collision-protect" ${FEATURES}; then - eerror "Due to previous eclass compiling Python files outside of src_install" - eerror "(and not recording resulting .pyc and .pyo files as owned by any package)" - eerror "merging this package with \"collision-protect\" in FEATURES will result" - eerror "in an error, please switch to using \"protect-owned\" instead." - die "\"collision-protect\" in FEATURES detected" + ewarn "Due to previous eclass compiling Python files outside of src_install" + ewarn "(and not recording resulting .pyc and .pyo files as owned by any package)" + ewarn "merging this package with \"collision-protect\" in FEATURES may result" + ewarn "in an error, please switch to using \"protect-owned\" instead." fi } |