summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-04-29 12:59:39 +0000
committerUlrich Müller <ulm@gentoo.org>2007-04-29 12:59:39 +0000
commit4683732b5e58a90580ee669d73a596377bb508c6 (patch)
treeab8c1692ce355a70e2ffe0c24d4d6473b916ed74 /eclass/elisp-common.eclass
parentFix dependencies and call java-pkg-2_pkg_setup in pkg_setup. (diff)
downloadgentoo-2-4683732b5e58a90580ee669d73a596377bb508c6.tar.gz
gentoo-2-4683732b5e58a90580ee669d73a596377bb508c6.tar.bz2
gentoo-2-4683732b5e58a90580ee669d73a596377bb508c6.zip
Handle the case in elisp-site-regen that there are no site-init files.
Diffstat (limited to 'eclass/elisp-common.eclass')
-rw-r--r--eclass/elisp-common.eclass12
1 files changed, 5 insertions, 7 deletions
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 3a788bfc8ec5..dfb2d3ca5524 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.19 2007/04/27 16:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.20 2007/04/29 12:59:39 ulm Exp $
#
# Copyright 2007 Christian Faulhammer <opfer@gentoo.org>
# Copyright 2002-2007 Matthew Kennedy <mkennedy@gentoo.org>
@@ -151,13 +151,11 @@ elisp-site-regen() {
;;; -----------------------------------------------------------------
EOF
- ls ${ROOT}${SITELISP}/[0-9][0-9]*-gentoo.el | sort -n | \
- while read sf
+ for sf in ${ROOT}${SITELISP}/[0-9][0-9]*-gentoo.el
do
- einfo " Adding $(basename $sf) ..."
- # Great for debugging, too noisy and slow for users though
-# echo "(message \"Loading $sf ...\")" >>${ROOT}${SITELISP}/site-start.el
- cat $sf >>${ROOT}${SITELISP}/site-gentoo.el
+ [ -r "${sf}" ] || continue
+ einfo " Adding $(basename ${sf}) ..."
+ cat "${sf}" >>${ROOT}${SITELISP}/site-gentoo.el
done
while read line; do einfo "${line}"; done <<EOF