grub-mkconfig: Fix detection of Emacs autosave files.

This commit is contained in:
Colin Watson 2013-08-11 15:05:59 +01:00
parent e7e4450537
commit 75c93276dd
4 changed files with 23 additions and 1 deletions

1
debian/changelog vendored
View File

@ -4,6 +4,7 @@ grub2 (2.00-16) UNRELEASED; urgency=low
missing LVM commands. missing LVM commands.
* Backport from upstream: * Backport from upstream:
- Move @itemize after @subsection to satisfy texinfo-5.1. - Move @itemize after @subsection to satisfy texinfo-5.1.
- grub-mkconfig: Fix detection of Emacs autosave files.
-- Colin Watson <cjwatson@debian.org> Sun, 11 Aug 2013 12:12:54 +0100 -- Colin Watson <cjwatson@debian.org> Sun, 11 Aug 2013 12:12:54 +0100

View File

@ -0,0 +1,20 @@
Description: Fix detection of Emacs autosave files
Author: Colin Watson <cjwatson@ubuntu.com>
Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/5089
Forwarded: not-needed
Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/5089
Last-Update: 2013-08-11
Index: b/util/grub-mkconfig.in
===================================================================
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -253,7 +253,7 @@
# emacsen backup files. FIXME: support other editors
*~) ;;
# emacsen autosave files. FIXME: support other editors
- \#*\#) ;;
+ */\#*\#) ;;
*)
if grub_file_is_not_garbage "$i" && test -x "$i" ; then
echo

View File

@ -48,3 +48,4 @@ os_prober_efi.patch
acpihalt_improvements.patch acpihalt_improvements.patch
script_check_no_commands.patch script_check_no_commands.patch
texinfo_ordering.patch texinfo_ordering.patch
mkconfig_emacs_autosave.patch

View File

@ -253,7 +253,7 @@ for i in ${grub_mkconfig_dir}/* ; do
# emacsen backup files. FIXME: support other editors # emacsen backup files. FIXME: support other editors
*~) ;; *~) ;;
# emacsen autosave files. FIXME: support other editors # emacsen autosave files. FIXME: support other editors
\#*\#) ;; */\#*\#) ;;
*) *)
if grub_file_is_not_garbage "$i" && test -x "$i" ; then if grub_file_is_not_garbage "$i" && test -x "$i" ; then
echo echo