diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-11-26 21:27:00 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-11-26 21:27:00 +0000 |
| commit | 8a74fe9e047775ffb4505687f6837e0dd6431627 (patch) | |
| tree | 3cfcc3d0ce14240b789b2ce02f5235102de19daa /app-editors | |
| parent | Fix documentation generation, bug 248944. (diff) | |
| download | gentoo-2-8a74fe9e047775ffb4505687f6837e0dd6431627.tar.gz gentoo-2-8a74fe9e047775ffb4505687f6837e0dd6431627.tar.bz2 gentoo-2-8a74fe9e047775ffb4505687f6837e0dd6431627.zip | |
Handle the FEATURES=noinfo case in emacs-infodir-rebuild; don't create a
spurious Info dir file when called with no files in postrm phase.
(Portage version: 2.2_rc15/cvs/Linux 2.6.27-gentoo-r4 i686)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 55fe5b7075a2..f57d25d6a9d9 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.223 2008/11/19 06:41:08 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.224 2008/11/26 21:27:00 ulm Exp $ + + 26 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild: + Handle the FEATURES=noinfo case in emacs-infodir-rebuild; don't create a + spurious Info dir file when called with no files in postrm phase. 19 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild: Update LICENSE: Add as-is and X11 for oldXMenu and etc/rgb.txt, diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild index 2aad1f371803..53723efa4632 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.13 2008/11/19 06:41:08 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.14 2008/11/26 21:27:00 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -239,13 +239,14 @@ emacs-infodir-rebuild() { # INFOPATH, which is not guaranteed. So we rebuild it ourselves. local infodir=/usr/share/info/${EMACS_SUFFIX} f + [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo einfo "Regenerating Info directory index in ${infodir} ..." rm -f "${ROOT}"${infodir}/dir{,.*} for f in "${ROOT}"${infodir}/*.info*; do - [[ ${f##*/} == *[0-9].info* ]] \ - || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null + [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ + && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null done - rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty + rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty echo } |