diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-02-16 20:12:26 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-02-16 20:12:26 +0000 |
| commit | df24a4890ec4894ae667b819105859b622523c3e (patch) | |
| tree | b4e76bf62f40a4271104fdd1c72033cf5e841162 /eclass/eutils.eclass | |
| parent | fixage (diff) | |
| download | historical-df24a4890ec4894ae667b819105859b622523c3e.tar.gz historical-df24a4890ec4894ae667b819105859b622523c3e.tar.bz2 historical-df24a4890ec4894ae667b819105859b622523c3e.zip | |
bug #15613
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 82d291fe8984..793d58565991 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.18 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.19 2003/02/16 20:12:26 azarah Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -157,6 +157,11 @@ epatch() { else if [ ! -d ${EPATCH_SOURCE} ] then + if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] + then + EPATCH_SOURCE="$1" + fi + echo eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" eerror @@ -259,7 +264,7 @@ epatch() { fi fi - if patch ${popts} --dry-run -f -p${count} < ${PATCH_TARGET} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 + if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 then draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real @@ -267,7 +272,7 @@ epatch() { echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real - patch ${popts} -p${count} < ${PATCH_TARGET} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 + cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 if [ "$?" -ne 0 ] then |