From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 32C4F198002 for ; Fri, 8 Mar 2013 19:57:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FD29E07D7; Fri, 8 Mar 2013 19:57:47 +0000 (UTC) Received: from a1www.kph.uni-mainz.de (a1iwww1.kph.uni-mainz.de [134.93.134.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDD5AE0767 for ; Fri, 8 Mar 2013 19:57:45 +0000 (UTC) Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1www.kph.uni-mainz.de (8.14.4/8.13.4) with ESMTP id r28JviRg028821 for ; Fri, 8 Mar 2013 20:57:44 +0100 Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.5/8.14.2) with ESMTP id r28JvhMm029756; Fri, 8 Mar 2013 20:57:43 +0100 Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.6/8.14.6/Submit) id r28JvhR5029754; Fri, 8 Mar 2013 20:57:43 +0100 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <20794.17079.866829.303673@a1i15.kph.uni-mainz.de> Date: Fri, 8 Mar 2013 20:57:43 +0100 To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 1/2] elisp-common.eclass: Some functions now die on failure. In-Reply-To: <20794.16989.965476.563290@a1i15.kph.uni-mainz.de> References: <20794.16989.965476.563290@a1i15.kph.uni-mainz.de> X-Mailer: VM 8.2.0b under 23.4.1 (x86_64-pc-linux-gnu) From: Ulrich Mueller X-Archives-Salt: 9197f7ad-ca06-4769-b887-18cd6215149c X-Archives-Hash: ad25057ef8468cc32db3d44dd1ddc014 * elisp-common.eclass (elisp-compile, elisp-make-autoload-file) (elisp-install, elisp-site-file-install): Die on failure. * elisp.eclass (elisp_src_compile, elisp_src_install): Remove die commands that are no longer necessary because the called functions die themselves. --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -50,7 +50,7 @@ # directory is added to the load-path which makes sure that all files # are loadable. # -# elisp-compile *.el || die +# elisp-compile *.el # # Function elisp-make-autoload-file() can be used to generate a file # with autoload definitions for the lisp functions. It takes the output @@ -70,7 +70,7 @@ # choose something else, but remember to tell elisp-site-file-install() # (see below) the change, as it defaults to ${PN}. # -# elisp-install ${PN} *.el *.elc || die +# elisp-install ${PN} *.el *.elc # # To let the Emacs support be activated by Emacs on startup, you need # to provide a site file (shipped in ${FILESDIR}) which contains the @@ -112,7 +112,7 @@ # # Which is then installed by # -# elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die +# elisp-site-file-install "${FILESDIR}/${SITEFILE}" # # in src_install(). Any characters after the "-gentoo" part and before # the extension will be stripped from the destination file's name. @@ -168,6 +168,7 @@ EMACSFLAGS="-batch -q --no-site-file" BYTECOMPFLAGS="-L ." # @FUNCTION: elisp-emacs-version +# @RETURN: exit status of Emacs # @DESCRIPTION: # Output version of currently active Emacs. @@ -223,7 +224,7 @@ elisp-need-emacs() { elisp-compile() { ebegin "Compiling GNU Emacs Elisp files" ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@" - eend $? "elisp-compile: batch-byte-compile failed" + eend $? "elisp-compile: batch-byte-compile failed" || die } # @FUNCTION: elisp-make-autoload-file @@ -259,7 +260,7 @@ elisp-make-autoload-file() { --eval "(setq generated-autoload-file (expand-file-name \"${f}\"))" \ -f batch-update-autoloads "${@-.}" - eend $? "elisp-make-autoload-file: batch-update-autoloads failed" + eend $? "elisp-make-autoload-file: batch-update-autoloads failed" || die } # @FUNCTION: elisp-install @@ -275,7 +276,7 @@ elisp-install() { insinto "${SITELISP}/${subdir}" doins "$@" ) - eend $? "elisp-install: doins failed" + eend $? "elisp-install: doins failed" || die } # @FUNCTION: elisp-site-file-install @@ -305,7 +306,7 @@ elisp-site-file-install() { ) ret=$? rm -f "${sf}" - eend ${ret} "elisp-site-file-install: doins failed" + eend ${ret} "elisp-site-file-install: doins failed" || die } # @FUNCTION: elisp-site-regen --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -151,7 +151,7 @@ elisp_src_configure() { :; } # GNU Info files from them. elisp_src_compile() { - elisp-compile *.el || die + elisp-compile *.el if [[ -n ${ELISP_TEXINFO} ]]; then makeinfo ${ELISP_TEXINFO} || die fi @@ -165,9 +165,9 @@ elisp_src_compile() { # ELISP_TEXINFO and documentation listed in the DOCS variable. elisp_src_install() { - elisp-install ${PN} *.el *.elc || die + elisp-install ${PN} *.el *.elc if [[ -n ${SITEFILE} ]]; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + elisp-site-file-install "${FILESDIR}/${SITEFILE}" fi if [[ -n ${ELISP_TEXINFO} ]]; then set -- ${ELISP_TEXINFO}