summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-05-31 17:50:33 +0000
committerMichał Górny <mgorny@gentoo.org>2013-05-31 17:50:33 +0000
commitf24b5e2bb8d532a2e88aee0d9a7692ced5c7a4ee (patch)
tree88019305f27a07beea93aefbe9b7bc776c4b67a4 /eclass
parentUse cat rather than echo for heredoc output :). (diff)
downloadgentoo-2-f24b5e2bb8d532a2e88aee0d9a7692ced5c7a4ee.tar.gz
gentoo-2-f24b5e2bb8d532a2e88aee0d9a7692ced5c7a4ee.tar.bz2
gentoo-2-f24b5e2bb8d532a2e88aee0d9a7692ced5c7a4ee.zip
Remove here-doc write failure handlers due to bug #471926.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/multilib-build.eclass4
-rw-r--r--eclass/python-utils-r1.eclass4
3 files changed, 9 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index ebd193ee7697..f44721e716c0 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.843 2013/05/31 17:40:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.844 2013/05/31 17:50:33 mgorny Exp $
+
+ 31 May 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass,
+ python-utils-r1.eclass:
+ Remove here-doc write failure handlers due to bug #471926.
31 May 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Use cat rather than echo for heredoc output :).
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 392993adc4a0..224ce0db1307 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.12 2013/05/14 17:33:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.13 2013/05/31 17:50:33 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -270,7 +270,7 @@ multilib_prepare_wrappers() {
if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
dodir "/tmp/multilib-include${dir}"
# a generic template
- cat > "${ED}/tmp/multilib-include${f}" <<_EOF_ || die
+ cat > "${ED}/tmp/multilib-include${f}" <<_EOF_
/* This file is auto-generated by multilib-build.eclass
* as a multilib-friendly wrapper. For the original content,
* please see the files that are #included below.
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 14679145b137..fdcfb4fe7d76 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.25 2013/05/31 17:40:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.26 2013/05/31 17:50:33 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -892,7 +892,7 @@ python_wrapper_setup() {
local x
for x in "${nonsupp[@]}"; do
- cat >"${workdir}"/bin/${x} <<__EOF__ || die
+ cat >"${workdir}"/bin/${x} <<__EOF__
#!/bin/sh
echo "${x} is not supported by ${EPYTHON}" >&2
exit 1