2009-09-23 Felix Zielcke <fzielcke@z-51.de>

	* util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Add support
	for `*.dpkg-new'.

diff --git a/ChangeLog b/ChangeLog
index 22aeb6feb3b850de5595596013545ee949f793d2..1ac4b4b3fbe3d3db1ba8dc2c05663368457bb360 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-23  Felix Zielcke  <fzielcke@z-51.de>
+
+       * util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Add support
+       for `*.dpkg-new'.
+
 2009-09-21  Colin Watson  <cjwatson@ubuntu.com>
 
        Build info documentation.  Some code borrowed from Automake.

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 2385b0878a8009a88285a0e4391e090a0e4772ef..a4db096f88c4a3daea55b8bc1ab2cf7dbd5b0a71 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -157,7 +157,7 @@ grub_file_is_not_garbage ()
 {
   if test -f "$1" ; then
     case "$1" in
-      *.dpkg-dist|*.dpkg-old|*.dpkg-tmp) return 1 ;; # debian dpkg
+      *.dpkg-dist|*.dpkg-old|*.dpkg-tmp|*.dpkg-new) return 1 ;; # debian dpkg
     esac
   else
     return 1