diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-11-04 21:36:36 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-11-04 21:36:36 +0000 |
| commit | 0a062dc044c6a2c41027a658c06536d6b7e8aee8 (patch) | |
| tree | 8d195cc183d8d1f280f7e0b1af3b42ced87bc8d9 /eclass | |
| parent | Stable for ppc, wrt bug #488536 (diff) | |
| download | gentoo-2-0a062dc044c6a2c41027a658c06536d6b7e8aee8.tar.gz gentoo-2-0a062dc044c6a2c41027a658c06536d6b7e8aee8.tar.bz2 gentoo-2-0a062dc044c6a2c41027a658c06536d6b7e8aee8.zip | |
Don't create site-gentoo.el in postrm phase.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/elisp-common.eclass | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 5902a3d3bd26..7ce4aa2db8f3 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1045 2013/11/03 07:58:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1046 2013/11/04 21:36:36 ulm Exp $ + + 04 Nov 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass: + Don't create site-gentoo.el in postrm phase. 03 Nov 2013; Michał Górny <mgorny@gentoo.org> tests/python-utils-r1.sh: Fix python-utils-r1 tests to accomodate versions in PYTHON_PKG_DEP. diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 015cac1b5c6e..c4215125b4fe 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.86 2013/09/04 19:16:40 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.87 2013/11/04 21:36:36 ulm Exp $ # # @ECLASS: elisp-common.eclass # @MAINTAINER: @@ -362,6 +362,11 @@ elisp-site-regen() { return 1 fi + if [[ ${EBUILD_PHASE} = *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then + ewarn "Refusing to create site-gentoo.el in ${EBUILD_PHASE} phase." + return 0 + fi + ebegin "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})" for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \ |