Only apply files from patch dir ending in diff/patch

diff --git a/ChangeLog b/ChangeLog
index f73660cb094c2b302e18ffec388d4e539ea7a42c..f803a6480617fa3f41eca67f4e0060d5cbbc6014 100644 (file)
--- 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 <agaffney@gentoo.org> gen_compile.sh:
+  Only apply files from patch dir ending in diff/patch
+
   24 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
   Fix CONSOLE= handling code for bug 232012
 

diff --git a/gen_compile.sh b/gen_compile.sh
index 7455aa648bb294fbc13ecdba405a5c66a841f848..e21e139daf30c1c11402651640d42184f8683d8a 100644 (file)
--- 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