From: Ulrich Müller <ulm@gentoo.org>
Date: Sun, 29 Apr 2007 12:59:39 +0000 (+0000)
Subject: Handle the case in elisp-site-regen that there are no site-init files.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81b543620f478d6d36c046633865d5491f11e19c;p=gentoo.git

Handle the case in elisp-site-regen that there are no site-init files.
---

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