diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-08-22 08:30:32 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-08-22 08:30:32 +0000 |
| commit | 00b0505e7d063603470fc0616d8501cab4c93c10 (patch) | |
| tree | 6848ea62f36b15a7d215f9950b9f2f0643f27f82 /eclass/elisp-common.eclass | |
| parent | x-modular -> xorg2 in eclassdoc (diff) | |
| download | historical-00b0505e7d063603470fc0616d8501cab4c93c10.tar.gz historical-00b0505e7d063603470fc0616d8501cab4c93c10.tar.bz2 historical-00b0505e7d063603470fc0616d8501cab4c93c10.zip | |
Sync eclasses from Emacs overlay (revision 1506).
elisp.eclass:
Update documentation.
elisp-common.eclass:
The nullglob shell option is not needed in elisp-site-regen, because
inside the loop we test for existence of all files. See also bug 328863.
The temporary file needs only be removed in the no changes case.
Diffstat (limited to 'eclass/elisp-common.eclass')
| -rw-r--r-- | eclass/elisp-common.eclass | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 7b21db63acf4..d535b2d6bc64 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,12 +1,12 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.65 2009/12/29 20:15:12 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.66 2010/08/22 08:30:32 ulm Exp $ # # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org> # Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com> # Copyright 2004-2005 Mamoru Komachi <usata@gentoo.org> # Copyright 2007-2008 Christian Faulhammer <fauli@gentoo.org> -# Copyright 2007-2009 Ulrich Müller <ulm@gentoo.org> +# Copyright 2007-2010 Ulrich Müller <ulm@gentoo.org> # # @ECLASS: elisp-common.eclass # @MAINTAINER: @@ -303,10 +303,6 @@ elisp-site-regen() { # auxiliary file for backwards compatibility. Remove any such file. rm -f "${sitelisp}"/00site-gentoo.el - # set nullglob option, there may be a directory without matching files - local old_shopts=$(shopt -p nullglob) - shopt -s nullglob - for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \ "${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el do @@ -319,8 +315,6 @@ elisp-site-regen() { sflist[i]=${sf} done - eval "${old_shopts}" - cat <<-EOF >"${T}"/site-gentoo.el ;;; site-gentoo.el --- site initialisation for Gentoo-installed packages @@ -349,6 +343,7 @@ elisp-site-regen() { # This prevents outputting unnecessary text when there # was actually no change. # A case is a remerge where we have doubled output. + rm -f "${T}"/site-gentoo.el echo " no changes." else mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el @@ -360,8 +355,5 @@ elisp-site-regen() { esac fi - # cleanup - rm -f "${T}"/site-gentoo.el - return 0 } |