From: "Matthias Maier" <tamiko@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/
Date: Tue, 30 Jan 2018 17:55:05 +0000 (UTC) [thread overview]
Message-ID: <1517334896.0a987006baf8f3267fb9df03e16baab99bf1f98b.tamiko@gentoo> (raw)
commit: 0a987006baf8f3267fb9df03e16baab99bf1f98b
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 17:39:01 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 17:54:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a987006
app-emulation/libvirt: add bashcompletion support
- also apply two minor bugfixes for version 4.0.0 (hopefully fixed in
the live version soon.)
Closes: https://bugs.gentoo.org/644632
Package-Manager: Portage-2.3.20, Repoman-2.3.6
.../libvirt-4.0.0-bash_completion_bugfixes.patch | 42 ++++++++++++++++++++++
app-emulation/libvirt/libvirt-4.0.0.ebuild | 6 +++-
app-emulation/libvirt/libvirt-9999.ebuild | 7 ++--
3 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch b/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
new file mode 100644
index 00000000000..65894ed4e1d
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
@@ -0,0 +1,42 @@
+https://www.redhat.com/archives/libvir-list/2018-January/msg00903.html
+https://www.redhat.com/archives/libvir-list/2018-January/msg00904.html
+
+diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
+index e216d9076..e3b8234b4 100644
+--- a/tools/virsh-completer.c
++++ b/tools/virsh-completer.c
+@@ -45,18 +45,11 @@ virshDomainNameCompleter(vshControl *ctl,
+
+ virCheckFlags(VIR_CONNECT_LIST_DOMAINS_ACTIVE |
+ VIR_CONNECT_LIST_DOMAINS_INACTIVE |
++ VIR_CONNECT_LIST_DOMAINS_OTHER |
++ VIR_CONNECT_LIST_DOMAINS_PAUSED |
+ VIR_CONNECT_LIST_DOMAINS_PERSISTENT |
+- VIR_CONNECT_LIST_DOMAINS_TRANSIENT |
+ VIR_CONNECT_LIST_DOMAINS_RUNNING |
+- VIR_CONNECT_LIST_DOMAINS_PAUSED |
+- VIR_CONNECT_LIST_DOMAINS_SHUTOFF |
+- VIR_CONNECT_LIST_DOMAINS_OTHER |
+- VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE |
+- VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE |
+- VIR_CONNECT_LIST_DOMAINS_AUTOSTART |
+- VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART |
+- VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT |
+- VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT,
++ VIR_CONNECT_LIST_DOMAINS_SHUTOFF,
+ NULL);
+
+ if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
+diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
+index 0f329d6d7..5a0e0c1b2 100644
+--- a/tools/virsh-domain.c
++++ b/tools/virsh-domain.c
+@@ -1037,7 +1037,7 @@ static const vshCmdInfo info_autostart[] = {
+ };
+
+ static const vshCmdOptDef opts_autostart[] = {
+- VIRSH_COMMON_OPT_DOMAIN_FULL(0),
++ VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_PERSISTENT),
+ {.name = "disable",
+ .type = VSH_OT_BOOL,
+ .help = N_("disable autostarting")
diff --git a/app-emulation/libvirt/libvirt-4.0.0.ebuild b/app-emulation/libvirt/libvirt-4.0.0.ebuild
index 487691cdac3..1107c986520 100644
--- a/app-emulation/libvirt/libvirt-4.0.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
+inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completion-r1
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@@ -127,6 +127,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488
+ "${FILESDIR}"/${PN}-4.0.0-bash_completion_bugfixes.patch # bug #644632
)
pkg_setup() {
@@ -358,6 +359,9 @@ src_install() {
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+ newbashcomp "${S}/tools/bash-completion/vsh" vsh
+ bashcomp_alias vsh virsh virt-admin
+
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
readme.gentoo_create_doc
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 3716e896837..84ae6b580a7 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
+inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completion-r1
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@@ -355,6 +355,9 @@ src_install() {
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+ newbashcomp "${S}/tools/bash-completion/vsh" vsh
+ bashcomp_alias vsh virsh virt-admin
+
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
readme.gentoo_create_doc
next reply other threads:[~2018-01-30 17:55 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-30 17:55 Matthias Maier [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-21 22:28 [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/ John Helmert III
2024-07-07 7:39 Sam James
2024-05-10 7:54 Joonas Niilola
2023-11-22 11:38 Sam James
2023-10-04 17:46 Matthias Maier
2023-07-12 9:17 Sam James
2023-06-24 1:42 Sam James
2023-06-21 21:48 Matthias Maier
2023-05-10 19:42 Sam James
2023-03-21 19:19 Sam James
2023-03-21 19:19 Sam James
2022-10-28 19:15 Sam James
2022-04-03 4:36 Sam James
2022-03-08 13:18 Sam James
2022-01-25 12:33 Matthias Maier
2022-01-04 16:43 Matthias Maier
2021-12-08 21:14 Matthias Maier
2021-06-10 14:41 Matthias Maier
2021-04-20 14:10 Matthias Maier
2020-12-08 22:56 Sergei Trofimovich
2020-10-07 15:43 Matthias Maier
2020-10-01 23:47 Matthias Maier
2020-09-05 7:54 Joonas Niilola
2020-07-21 18:11 Marek Szuba
2020-04-11 1:54 Matthias Maier
2020-04-05 17:19 Matthias Maier
2019-08-30 16:09 Matthias Maier
2019-08-01 14:28 Matthias Maier
2019-05-09 19:33 William Hubbs
2019-03-17 7:27 Matthias Maier
2019-01-25 16:28 Matthias Maier
2019-01-13 2:18 Matthias Maier
2018-11-04 5:13 Matthias Maier
2018-03-24 2:25 Matthias Maier
2018-03-23 14:06 Matthias Maier
2018-03-14 18:18 Matthias Maier
2018-02-12 22:48 Matthias Maier
2018-01-30 17:08 Matthias Maier
2018-01-30 17:08 Matthias Maier
2017-12-07 16:08 Matthias Maier
2017-11-15 0:22 Matthias Maier
2017-11-12 19:36 Matthias Maier
2017-10-25 19:48 Matthias Maier
2017-06-03 15:18 Matthias Maier
2017-03-04 21:39 Matthias Maier
2017-03-04 21:27 Matthias Maier
2017-01-22 18:36 Matthias Maier
2017-01-22 16:28 Matthias Maier
2016-07-09 21:01 Matthias Maier
2016-06-30 21:40 Matthias Maier
2016-06-30 16:18 Matthias Maier
2016-03-14 21:20 Doug Goldstein
2016-02-03 4:15 Matthias Maier
2015-12-26 23:02 Matthias Maier
2015-12-04 6:17 Matthias Maier
2015-10-03 18:16 Matthias Maier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1517334896.0a987006baf8f3267fb9df03e16baab99bf1f98b.tamiko@gentoo \
--to=tamiko@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox