[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/

[Matthias Maier]

commit:     b357d99e5031bdaea97c063d745f77e1161e73fe
Author:     Jonathan Davies <jpds <AT> protonmail <DOT> com>
AuthorDate: Sun Sep 27 09:48:47 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 23:46:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b357d99e

app-emulation/libvirt: 6.7.0 and 9999: Added "|| die" to all rm/touch calls.

Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 app-emulation/libvirt/libvirt-6.7.0.ebuild | 12 ++++++------
 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 a04d0e1a215..14eac7e77cd 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 1080d623617..6f81a09abc9 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