From 3f7b2e8eea0af5b1cb14d56dbd2a4baa11e75a02 Mon Sep 17 00:00:00 2001 From: agaffney Date: Sun, 24 Aug 2008 22:42:25 -0500 Subject: [PATCH] Only apply files from patch dir ending in diff/patch --- ChangeLog | 3 +++ gen_compile.sh | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f73660c..f803a64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni # Distributed under the GPL v2 + 25 Aug 2008; Andrew Gaffney gen_compile.sh: + Only apply files from patch dir ending in diff/patch + 24 Aug 2008; Andrew Gaffney defaults/linuxrc: Fix CONSOLE= handling code for bug 232012 diff --git a/gen_compile.sh b/gen_compile.sh index 7455aa6..e21e139 100644 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -193,7 +193,7 @@ apply_patches() { if [ -d "${GK_SHARE}/patches/${util}/${version}" ] then print_info 1 "${util}: >> Applying patches..." - for i in ${GK_SHARE}/patches/${util}/${version}/* + for i in ${GK_SHARE}/patches/${util}/${version}/*{diff,patch} do patch_success=0 for j in `seq 0 5` @@ -207,7 +207,6 @@ apply_patches() { done if [ ${patch_success} != 1 ] then -# return 1 gen_die "could not apply patch ${i} for ${util}-${version}" fi done -- 2.26.2