From: fzielcke <fzielcke@localhost>
Date: Wed, 23 Sep 2009 09:26:34 +0000 (+0000)
Subject: 2009-09-23  Felix Zielcke  <fzielcke@z-51.de>
X-Git-Tag: 1.98~521
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b3f8365713e8636f5ed97bb263c90f47ea0caa6;p=thirdparty%2Fgrub.git

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 22aeb6feb..1ac4b4b3f 100644
--- 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 2385b0878..a4db096f8 100644
--- 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