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 1E5211384B4 for ; Mon, 21 Dec 2015 07:52:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 848BA21C0D1; Mon, 21 Dec 2015 07:52:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E5B721C0D1 for ; Mon, 21 Dec 2015 07:52:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F002E33F9D2 for ; Mon, 21 Dec 2015 07:52:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE3DBA91 for ; Mon, 21 Dec 2015 07:52:42 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1450684346.d5beda4d171865e8f8c4e6e23d7cea110bff40fb.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/readme.gentoo-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: d5beda4d171865e8f8c4e6e23d7cea110bff40fb X-VCS-Branch: master Date: Mon, 21 Dec 2015 07:52:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 43b1ab2b-3406-49ff-877d-9d2da91208be X-Archives-Hash: bda6aa125d5292297d874db6728a0087 commit: d5beda4d171865e8f8c4e6e23d7cea110bff40fb Author: Ulrich Müller gentoo org> AuthorDate: Sat Dec 19 14:15:05 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Dec 21 07:52:26 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5beda4d readme.gentoo-r1.eclass: Do not inherit eutils. This was only needed in readme.gentoo_create_doc() for a single call of eshopts_{push,pop}. Replace it by saving the set of options in a variable. Die if writing the temp file in readme.gentoo_create_doc() fails. eclass/readme.gentoo-r1.eclass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass index c076650..07320c0 100644 --- a/eclass/readme.gentoo-r1.eclass +++ b/eclass/readme.gentoo-r1.eclass @@ -21,8 +21,6 @@ if [[ -z ${_README_GENTOO_ECLASS} ]]; then _README_GENTOO_ECLASS=1 -inherit eutils - case "${EAPI:-0}" in 0|1|2|3) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" @@ -61,15 +59,16 @@ readme.gentoo_create_doc() { debug-print-function ${FUNCNAME} "${@}" if [[ -n "${DOC_CONTENTS}" ]]; then - eshopts_push - set -f if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then - echo "${DOC_CONTENTS}" > "${T}"/README.gentoo + echo "${DOC_CONTENTS}" > "${T}"/README.gentoo || die else + local saved_flags=$- + set -f # disable filename expansion in echo arguments echo -e ${DOC_CONTENTS} | fold -s -w 70 \ | sed 's/[[:space:]]*$//' > "${T}"/README.gentoo + assert + set +f -${saved_flags} fi - eshopts_pop elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die elif [[ -f "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" ]]; then