diff options
| author |   Jonathan Davies <jpds@protonmail.com> | 2020-09-27 09:48:47 +0000 |
|---|---|---|
| committer |   Matthias Maier <tamiko@gentoo.org> | 2020-10-01 18:46:32 -0500 |
| commit | b357d99e5031bdaea97c063d745f77e1161e73fe (patch) | |
| tree | bf911b2e23a8784931c535770841a734d67bce8a | |
| parent | app-emulation/libvirt: Dropped Python 3.6 compat. (diff) | |
| download | gentoo-b357d99e.tar.gz gentoo-b357d99e.tar.bz2 gentoo-b357d99e.zip | |
app-emulation/libvirt: 6.7.0 and 9999: Added "|| die" to all rm/touch calls.
Signed-off-by: Jonathan Davies <jpds@protonmail.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
| -rw-r--r-- | app-emulation/libvirt/libvirt-6.7.0.ebuild | 12 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-9999.ebuild | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/app-emulation/libvirt/libvirt-6.7.0.ebuild b/app-emulation/libvirt/libvirt-6.7.0.ebuild index a04d0e1a2153..14eac7e77cd8 100644 --- a/app-emulation/libvirt/libvirt-6.7.0.ebuild +++ b/app-emulation/libvirt/libvirt-6.7.0.ebuild @@ -213,7 +213,7 @@ pkg_setup() { } src_prepare() { - touch "${S}/.mailmap" + touch "${S}/.mailmap" || die default @@ -299,9 +299,9 @@ src_install() { # Remove bogus, empty directories. They are either not used, or # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run + rm -rf "${D}"/etc/sysconfig || die + rm -rf "${D}"/var || die + rm -rf "${D}"/run || die newbashcomp "${S}/tools/bash-completion/vsh" virsh bashcomp_alias virsh virt-admin @@ -327,13 +327,13 @@ src_install() { pkg_preinst() { # we only ever want to generate this once if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml + rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die fi } pkg_postinst() { if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die fi use libvirtd || return 0 diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 1080d6236171..6f81a09abc9f 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -210,7 +210,7 @@ pkg_setup() { } src_prepare() { - touch "${S}/.mailmap" + touch "${S}/.mailmap" || die default @@ -296,9 +296,9 @@ src_install() { # Remove bogus, empty directories. They are either not used, or # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run + rm -rf "${D}"/etc/sysconfig || die + rm -rf "${D}"/var || die + rm -rf "${D}"/run || die newbashcomp "${S}/tools/bash-completion/vsh" virsh bashcomp_alias virsh virt-admin @@ -324,13 +324,13 @@ src_install() { pkg_preinst() { # we only ever want to generate this once if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml + rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die fi } pkg_postinst() { if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die fi use libvirtd || return 0 |