* grub-mkconfig_lib.in: Ignore *.rpmnew and *.rpmsave.

diff --git a/ChangeLog b/ChangeLog
index 84ad00af1218639554e8e930a14cf1425e73d1f6..e19ee88befb93c84a370904c659ddc3def1cfdf3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-18  Mads Kiilerich <mads@kiilerich.com>
+
+         * grub-mkconfig_lib.in: Ignore *.rpmnew and *.rpmsave.
+
 2012-04-18  Mike Gilbert  <floppym@gentoo.org>
 
        * util/grub.d/10_linux.in: Fix detection of genkernel initramfs.

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 1227154482dd0e98d16466ea408432b32c898679..d0b7a7073496614957cfa7be1f67e49d2ed5e69b 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -177,6 +177,7 @@ grub_file_is_not_garbage ()
   if test -f "$1" ; then
     case "$1" in
       *.dpkg-*) return 1 ;; # debian dpkg
+      *.rpmsave|*.rpmnew) return 1 ;;
       README*|*/README*)  return 1 ;; # documentation
     esac
   else