* [gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.02_beta2-bash-completions.patch
@ 2014-12-04 9:37 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2014-12-04 9:37 UTC (permalink / raw
To: gentoo-commits
jlec 14/12/04 09:37:37
Added: grub-2.02_beta2-bash-completions.patch
Log:
sys-boot/grub: Fix QA issues with bash-completions, #526138
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.1 sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch?rev=1.1&content-type=text/plain
Index: grub-2.02_beta2-bash-completions.patch
===================================================================
util/bash-completion.d/grub-completion.bash.in | 39 +++++++++-----------------
1 file changed, 13 insertions(+), 26 deletions(-)
diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
index 44bf135..d4235e7 100644
--- a/util/bash-completion.d/grub-completion.bash.in
+++ b/util/bash-completion.d/grub-completion.bash.in
@@ -166,13 +166,11 @@ _grub_set_entry () {
}
__grub_set_default_program="@grub_set_default@"
-have ${__grub_set_default_program} && \
- complete -F _grub_set_entry -o filenames ${__grub_set_default_program}
+complete -F _grub_set_entry -o filenames ${__grub_set_default_program}
unset __grub_set_default_program
__grub_reboot_program="@grub_reboot@"
-have ${__grub_reboot_program} && \
- complete -F _grub_set_entry -o filenames ${__grub_reboot_program}
+complete -F _grub_set_entry -o filenames ${__grub_reboot_program}
unset __grub_reboot_program
@@ -198,8 +196,7 @@ _grub_editenv () {
}
__grub_editenv_program="@grub_editenv@"
-have ${__grub_editenv_program} && \
- complete -F _grub_editenv -o filenames ${__grub_editenv_program}
+complete -F _grub_editenv -o filenames ${__grub_editenv_program}
unset __grub_editenv_program
@@ -219,8 +216,7 @@ _grub_mkconfig () {
fi
}
__grub_mkconfig_program="@grub_mkconfig@"
-have ${__grub_mkconfig_program} && \
- complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program}
+complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program}
unset __grub_mkconfig_program
@@ -254,13 +250,11 @@ _grub_setup () {
}
__grub_bios_setup_program="@grub_bios_setup@"
-have ${__grub_bios_setup_program} && \
- complete -F _grub_setup -o filenames ${__grub_bios_setup_program}
+complete -F _grub_setup -o filenames ${__grub_bios_setup_program}
unset __grub_bios_setup_program
__grub_sparc64_setup_program="@grub_sparc64_setup@"
-have ${__grub_sparc64_setup_program} && \
- complete -F _grub_setup -o filenames ${__grub_sparc64_setup_program}
+complete -F _grub_setup -o filenames ${__grub_sparc64_setup_program}
unset __grub_sparc64_setup_program
@@ -305,8 +299,7 @@ _grub_install () {
fi
}
__grub_install_program="@grub_install@"
-have ${__grub_install_program} && \
- complete -F _grub_install -o filenames ${__grub_install_program}
+complete -F _grub_install -o filenames ${__grub_install_program}
unset __grub_install_program
@@ -327,8 +320,7 @@ _grub_mkfont () {
fi
}
__grub_mkfont_program="@grub_mkfont@"
-have ${__grub_mkfont_program} && \
- complete -F _grub_mkfont -o filenames ${__grub_mkfont_program}
+complete -F _grub_mkfont -o filenames ${__grub_mkfont_program}
unset __grub_mkfont_program
@@ -358,8 +350,7 @@ _grub_mkrescue () {
fi
}
__grub_mkrescue_program="@grub_mkrescue@"
-have ${__grub_mkrescue_program} && \
- complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program}
+complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program}
unset __grub_mkrescue_program
@@ -400,8 +391,7 @@ _grub_mkimage () {
fi
}
__grub_mkimage_program="@grub_mkimage@"
-have ${__grub_mkimage_program} && \
- complete -F _grub_mkimage -o filenames ${__grub_mkimage_program}
+complete -F _grub_mkimage -o filenames ${__grub_mkimage_program}
unset __grub_mkimage_program
@@ -422,8 +412,7 @@ _grub_mkpasswd_pbkdf2 () {
fi
}
__grub_mkpasswd_pbkdf2_program="@grub_mkpasswd_pbkdf2@"
-have ${__grub_mkpasswd_pbkdf2_program} && \
- complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
+complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
unset __grub_mkpasswd_pbkdf2_program
@@ -460,8 +449,7 @@ _grub_probe () {
fi
}
__grub_probe_program="@grub_probe@"
-have ${__grub_probe_program} && \
- complete -F _grub_probe -o filenames ${__grub_probe_program}
+complete -F _grub_probe -o filenames ${__grub_probe_program}
unset __grub_probe_program
@@ -482,8 +470,7 @@ _grub_script_check () {
fi
}
__grub_script_check_program="@grub_script_check@"
-have ${__grub_script_check_program} && \
- complete -F _grub_script_check -o filenames ${__grub_script_check_program}
+complete -F _grub_script_check -o filenames ${__grub_script_check_program}
# Local variables:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.02_beta2-bash-completions.patch
@ 2014-12-06 3:25 Mike Gilbert (floppym)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert (floppym) @ 2014-12-06 3:25 UTC (permalink / raw
To: gentoo-commits
floppym 14/12/06 03:25:14
Modified: grub-2.02_beta2-bash-completions.patch
Log:
Replace grub-completion patch with the version I sent upstream.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.2 sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch?r1=1.1&r2=1.2
Index: grub-2.02_beta2-bash-completions.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-2.02_beta2-bash-completions.patch 4 Dec 2014 09:37:37 -0000 1.1
+++ grub-2.02_beta2-bash-completions.patch 6 Dec 2014 03:25:14 -0000 1.2
@@ -1,129 +1,162 @@
- util/bash-completion.d/grub-completion.bash.in | 39 +++++++++-----------------
- 1 file changed, 13 insertions(+), 26 deletions(-)
+From 4851461c8f197d15220809cf1380299f5b1a493e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 21 Oct 2014 12:09:06 -0400
+Subject: [PATCH] bash-completion: Remove obsolete usage of 'have' function
+
+Recent versions of bash-completion do not provide the 'have' function.
+To keep things simple, this patch just removes it completely.
+---
+ ChangeLog | 4 ++
+ util/bash-completion.d/grub-completion.bash.in | 66 +++++---------------------
+ 2 files changed, 17 insertions(+), 53 deletions(-)
diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 44bf135..d4235e7 100644
+index 44bf135..2b98004 100644
--- a/util/bash-completion.d/grub-completion.bash.in
+++ b/util/bash-completion.d/grub-completion.bash.in
-@@ -166,13 +166,11 @@ _grub_set_entry () {
+@@ -165,15 +165,8 @@ _grub_set_entry () {
+ fi
}
- __grub_set_default_program="@grub_set_default@"
+-__grub_set_default_program="@grub_set_default@"
-have ${__grub_set_default_program} && \
- complete -F _grub_set_entry -o filenames ${__grub_set_default_program}
-+complete -F _grub_set_entry -o filenames ${__grub_set_default_program}
- unset __grub_set_default_program
-
- __grub_reboot_program="@grub_reboot@"
+-unset __grub_set_default_program
+-
+-__grub_reboot_program="@grub_reboot@"
-have ${__grub_reboot_program} && \
- complete -F _grub_set_entry -o filenames ${__grub_reboot_program}
-+complete -F _grub_set_entry -o filenames ${__grub_reboot_program}
- unset __grub_reboot_program
+-unset __grub_reboot_program
++complete -F _grub_set_entry -o filenames @grub_set_default@
++complete -F _grub_set_entry -o filenames @grub_reboot@
-@@ -198,8 +196,7 @@ _grub_editenv () {
+ #
+@@ -197,10 +190,7 @@ _grub_editenv () {
+ create list set unset"
}
- __grub_editenv_program="@grub_editenv@"
+-__grub_editenv_program="@grub_editenv@"
-have ${__grub_editenv_program} && \
- complete -F _grub_editenv -o filenames ${__grub_editenv_program}
-+complete -F _grub_editenv -o filenames ${__grub_editenv_program}
- unset __grub_editenv_program
+-unset __grub_editenv_program
++complete -F _grub_editenv -o filenames @grub_editenv@
-@@ -219,8 +216,7 @@ _grub_mkconfig () {
+ #
+@@ -218,10 +208,7 @@ _grub_mkconfig () {
+ _filedir
fi
}
- __grub_mkconfig_program="@grub_mkconfig@"
+-__grub_mkconfig_program="@grub_mkconfig@"
-have ${__grub_mkconfig_program} && \
- complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program}
-+complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program}
- unset __grub_mkconfig_program
+-unset __grub_mkconfig_program
++complete -F _grub_mkconfig -o filenames @grub_mkconfig@
-@@ -254,13 +250,11 @@ _grub_setup () {
+ #
+@@ -253,15 +240,8 @@ _grub_setup () {
+ fi
}
- __grub_bios_setup_program="@grub_bios_setup@"
+-__grub_bios_setup_program="@grub_bios_setup@"
-have ${__grub_bios_setup_program} && \
- complete -F _grub_setup -o filenames ${__grub_bios_setup_program}
-+complete -F _grub_setup -o filenames ${__grub_bios_setup_program}
- unset __grub_bios_setup_program
-
- __grub_sparc64_setup_program="@grub_sparc64_setup@"
+-unset __grub_bios_setup_program
+-
+-__grub_sparc64_setup_program="@grub_sparc64_setup@"
-have ${__grub_sparc64_setup_program} && \
- complete -F _grub_setup -o filenames ${__grub_sparc64_setup_program}
-+complete -F _grub_setup -o filenames ${__grub_sparc64_setup_program}
- unset __grub_sparc64_setup_program
+-unset __grub_sparc64_setup_program
++complete -F _grub_setup -o filenames @grub_bios_setup@
++complete -F _grub_setup -o filenames @grub_sparc64_setup@
-@@ -305,8 +299,7 @@ _grub_install () {
+ #
+@@ -304,10 +284,7 @@ _grub_install () {
+ _filedir
fi
}
- __grub_install_program="@grub_install@"
+-__grub_install_program="@grub_install@"
-have ${__grub_install_program} && \
- complete -F _grub_install -o filenames ${__grub_install_program}
-+complete -F _grub_install -o filenames ${__grub_install_program}
- unset __grub_install_program
+-unset __grub_install_program
++complete -F _grub_install -o filenames @grub_install@
-@@ -327,8 +320,7 @@ _grub_mkfont () {
+ #
+@@ -326,10 +303,7 @@ _grub_mkfont () {
+ _filedir
fi
}
- __grub_mkfont_program="@grub_mkfont@"
+-__grub_mkfont_program="@grub_mkfont@"
-have ${__grub_mkfont_program} && \
- complete -F _grub_mkfont -o filenames ${__grub_mkfont_program}
-+complete -F _grub_mkfont -o filenames ${__grub_mkfont_program}
- unset __grub_mkfont_program
+-unset __grub_mkfont_program
++complete -F _grub_mkfont -o filenames @grub_mkfont@
-@@ -358,8 +350,7 @@ _grub_mkrescue () {
+ #
+@@ -357,10 +331,7 @@ _grub_mkrescue () {
+ _filedir
fi
}
- __grub_mkrescue_program="@grub_mkrescue@"
+-__grub_mkrescue_program="@grub_mkrescue@"
-have ${__grub_mkrescue_program} && \
- complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program}
-+complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program}
- unset __grub_mkrescue_program
+-unset __grub_mkrescue_program
++complete -F _grub_mkrescue -o filenames @grub_mkrescue@
-@@ -400,8 +391,7 @@ _grub_mkimage () {
+ #
+@@ -399,10 +370,7 @@ _grub_mkimage () {
+ _filedir
fi
}
- __grub_mkimage_program="@grub_mkimage@"
+-__grub_mkimage_program="@grub_mkimage@"
-have ${__grub_mkimage_program} && \
- complete -F _grub_mkimage -o filenames ${__grub_mkimage_program}
-+complete -F _grub_mkimage -o filenames ${__grub_mkimage_program}
- unset __grub_mkimage_program
+-unset __grub_mkimage_program
++complete -F _grub_mkimage -o filenames @grub_mkimage@
-@@ -422,8 +412,7 @@ _grub_mkpasswd_pbkdf2 () {
+ #
+@@ -421,10 +389,7 @@ _grub_mkpasswd_pbkdf2 () {
+ _filedir
fi
}
- __grub_mkpasswd_pbkdf2_program="@grub_mkpasswd_pbkdf2@"
+-__grub_mkpasswd_pbkdf2_program="@grub_mkpasswd_pbkdf2@"
-have ${__grub_mkpasswd_pbkdf2_program} && \
- complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
-+complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
- unset __grub_mkpasswd_pbkdf2_program
+-unset __grub_mkpasswd_pbkdf2_program
++complete -F _grub_mkpasswd_pbkdf2 -o filenames @grub_mkpasswd_pbkdf2@
-@@ -460,8 +449,7 @@ _grub_probe () {
+ #
+@@ -459,10 +424,7 @@ _grub_probe () {
+ _filedir
fi
}
- __grub_probe_program="@grub_probe@"
+-__grub_probe_program="@grub_probe@"
-have ${__grub_probe_program} && \
- complete -F _grub_probe -o filenames ${__grub_probe_program}
-+complete -F _grub_probe -o filenames ${__grub_probe_program}
- unset __grub_probe_program
+-unset __grub_probe_program
++complete -F _grub_probe -o filenames @grub_probe@
-@@ -482,8 +470,7 @@ _grub_script_check () {
+ #
+@@ -481,9 +443,7 @@ _grub_script_check () {
+ _filedir
fi
}
- __grub_script_check_program="@grub_script_check@"
+-__grub_script_check_program="@grub_script_check@"
-have ${__grub_script_check_program} && \
- complete -F _grub_script_check -o filenames ${__grub_script_check_program}
-+complete -F _grub_script_check -o filenames ${__grub_script_check_program}
++complete -F _grub_script_check -o filenames @grub_script_check@
# Local variables:
+--
+2.2.0
+
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.02_beta2-bash-completions.patch
@ 2014-12-07 17:03 Mike Gilbert (floppym)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert (floppym) @ 2014-12-07 17:03 UTC (permalink / raw
To: gentoo-commits
floppym 14/12/07 17:03:28
Removed: grub-2.02_beta2-bash-completions.patch
Log:
Drop bash-completion patch until uptream approves of something.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-12-07 17:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-07 17:03 [gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.02_beta2-bash-completions.patch Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2014-12-06 3:25 Mike Gilbert (floppym)
2014-12-04 9:37 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox