diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-12-10 18:21:54 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-12-10 18:21:54 +0000 |
| commit | 2b17902db2f61597eb18d9a36d114a252d3f6f59 (patch) | |
| tree | fef28f589663c8d23bfe56a74d6218bb667ceaaf /eclass | |
| parent | Stable on x86, bug #156662. (diff) | |
| download | gentoo-2-2b17902db2f61597eb18d9a36d114a252d3f6f59.tar.gz gentoo-2-2b17902db2f61597eb18d9a36d114a252d3f6f59.tar.bz2 gentoo-2-2b17902db2f61597eb18d9a36d114a252d3f6f59.zip | |
Adding --no-backup-if-mismatch to the unipatch opts, so patch doesn't leave the .orig files around.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kernel-2.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 28c7f44b73fc..3d31257886d1 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.198 2006/12/02 18:43:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.199 2006/12/10 18:21:54 phreak Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -821,13 +821,13 @@ unipatch() { ebegin "Applying ${i/*\//} (-p${PATCH_DEPTH}+)" while [ ${PATCH_DEPTH} -lt 5 ]; do echo "Attempting Dry-run:" >> ${STDERR_T} - echo "cmd: patch -p${PATCH_DEPTH} --dry-run -f < ${i}" >> ${STDERR_T} + echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T} echo "=======================================================" >> ${STDERR_T} - if [ $(patch -p${PATCH_DEPTH} --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then + if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then echo "Attempting patch:" > ${STDERR_T} - echo "cmd: patch -p${PATCH_DEPTH} -f < ${i}" >> ${STDERR_T} + echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i}" >> ${STDERR_T} echo "=======================================================" >> ${STDERR_T} - if [ $(patch -p${PATCH_DEPTH} -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then + if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then eend 0 rm ${STDERR_T} break |