| 1 |
ulm 08/09/24 09:47:04 |
| 2 |
|
| 3 |
Modified: elisp-common.eclass |
| 4 |
Log: |
| 5 |
Be less verbose, bug 237546. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.47 eclass/elisp-common.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?rev=1.47&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?rev=1.47&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?r1=1.46&r2=1.47 |
| 13 |
|
| 14 |
Index: elisp-common.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v |
| 17 |
retrieving revision 1.46 |
| 18 |
retrieving revision 1.47 |
| 19 |
diff -u -r1.46 -r1.47 |
| 20 |
--- elisp-common.eclass 19 Sep 2008 08:12:48 -0000 1.46 |
| 21 |
+++ elisp-common.eclass 24 Sep 2008 09:47:04 -0000 1.47 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.46 2008/09/19 08:12:48 ulm Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.47 2008/09/24 09:47:04 ulm Exp $ |
| 27 |
# |
| 28 |
# Copyright 2002-2004 Matthew Kennedy <mkennedy@g.o> |
| 29 |
# Copyright 2003 Jeremy Maitin-Shepard <jbms@×××××.com> |
| 30 |
@@ -312,7 +312,7 @@ |
| 31 |
# when generating the start-up file. |
| 32 |
|
| 33 |
elisp-site-regen() { |
| 34 |
- local i sf line obsolete |
| 35 |
+ local i sf line firstrun obsolete |
| 36 |
local -a sflist |
| 37 |
# Work around Paludis borkage: variable T is empty in pkg_postrm |
| 38 |
local tmpdir=${T:-$(mktemp -d)} |
| 39 |
@@ -322,8 +322,9 @@ |
| 40 |
return 1 |
| 41 |
fi |
| 42 |
|
| 43 |
- if [ ! -e "${ROOT}${SITELISP}"/site-gentoo.el ] \ |
| 44 |
- && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then |
| 45 |
+ [ -e "${ROOT}${SITELISP}"/site-gentoo.el ] || firstrun=t |
| 46 |
+ |
| 47 |
+ if [ "${firstrun}" ] && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then |
| 48 |
einfo "Creating default ${SITELISP}/site-start.el ..." |
| 49 |
cat <<-EOF >"${tmpdir}"/site-start.el |
| 50 |
;;; site-start.el |
| 51 |
@@ -398,11 +399,10 @@ |
| 52 |
&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \ |
| 53 |
&& mv "${tmpdir}"/site-start.el "${ROOT}${SITELISP}"/site-start.el |
| 54 |
echo |
| 55 |
- for sf in "${sflist[@]##*/}"; do |
| 56 |
- einfo " Adding ${sf} ..." |
| 57 |
- done |
| 58 |
- einfo "Regenerated ${SITELISP}/site-gentoo.el." |
| 59 |
+ einfo "... ${#sflist[@]} site initialisation file(s) included." |
| 60 |
+ fi |
| 61 |
|
| 62 |
+ if [ "${firstrun}" ]; then |
| 63 |
echo |
| 64 |
while read line; do einfo "${line:- }"; done <<-EOF |
| 65 |
All site initialisation for Gentoo-installed packages is added to |
Archives