| 1 |
commit: b357d99e5031bdaea97c063d745f77e1161e73fe |
| 2 |
Author: Jonathan Davies <jpds <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 27 09:48:47 2020 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 1 23:46:32 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b357d99e |
| 7 |
|
| 8 |
app-emulation/libvirt: 6.7.0 and 9999: Added "|| die" to all rm/touch calls. |
| 9 |
|
| 10 |
Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com> |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/libvirt/libvirt-6.7.0.ebuild | 12 ++++++------ |
| 14 |
app-emulation/libvirt/libvirt-9999.ebuild | 12 ++++++------ |
| 15 |
2 files changed, 12 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/libvirt/libvirt-6.7.0.ebuild b/app-emulation/libvirt/libvirt-6.7.0.ebuild |
| 18 |
index a04d0e1a215..14eac7e77cd 100644 |
| 19 |
--- a/app-emulation/libvirt/libvirt-6.7.0.ebuild |
| 20 |
+++ b/app-emulation/libvirt/libvirt-6.7.0.ebuild |
| 21 |
@@ -213,7 +213,7 @@ pkg_setup() { |
| 22 |
} |
| 23 |
|
| 24 |
src_prepare() { |
| 25 |
- touch "${S}/.mailmap" |
| 26 |
+ touch "${S}/.mailmap" || die |
| 27 |
|
| 28 |
default |
| 29 |
|
| 30 |
@@ -299,9 +299,9 @@ src_install() { |
| 31 |
|
| 32 |
# Remove bogus, empty directories. They are either not used, or |
| 33 |
# libvirtd is able to create them on demand |
| 34 |
- rm -rf "${D}"/etc/sysconfig |
| 35 |
- rm -rf "${D}"/var |
| 36 |
- rm -rf "${D}"/run |
| 37 |
+ rm -rf "${D}"/etc/sysconfig || die |
| 38 |
+ rm -rf "${D}"/var || die |
| 39 |
+ rm -rf "${D}"/run || die |
| 40 |
|
| 41 |
newbashcomp "${S}/tools/bash-completion/vsh" virsh |
| 42 |
bashcomp_alias virsh virt-admin |
| 43 |
@@ -327,13 +327,13 @@ src_install() { |
| 44 |
pkg_preinst() { |
| 45 |
# we only ever want to generate this once |
| 46 |
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
| 47 |
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml |
| 48 |
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die |
| 49 |
fi |
| 50 |
} |
| 51 |
|
| 52 |
pkg_postinst() { |
| 53 |
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
| 54 |
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml |
| 55 |
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die |
| 56 |
fi |
| 57 |
|
| 58 |
use libvirtd || return 0 |
| 59 |
|
| 60 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
| 61 |
index 1080d623617..6f81a09abc9 100644 |
| 62 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
| 63 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
| 64 |
@@ -210,7 +210,7 @@ pkg_setup() { |
| 65 |
} |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
- touch "${S}/.mailmap" |
| 69 |
+ touch "${S}/.mailmap" || die |
| 70 |
|
| 71 |
default |
| 72 |
|
| 73 |
@@ -296,9 +296,9 @@ src_install() { |
| 74 |
|
| 75 |
# Remove bogus, empty directories. They are either not used, or |
| 76 |
# libvirtd is able to create them on demand |
| 77 |
- rm -rf "${D}"/etc/sysconfig |
| 78 |
- rm -rf "${D}"/var |
| 79 |
- rm -rf "${D}"/run |
| 80 |
+ rm -rf "${D}"/etc/sysconfig || die |
| 81 |
+ rm -rf "${D}"/var || die |
| 82 |
+ rm -rf "${D}"/run || die |
| 83 |
|
| 84 |
newbashcomp "${S}/tools/bash-completion/vsh" virsh |
| 85 |
bashcomp_alias virsh virt-admin |
| 86 |
@@ -324,13 +324,13 @@ src_install() { |
| 87 |
pkg_preinst() { |
| 88 |
# we only ever want to generate this once |
| 89 |
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
| 90 |
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml |
| 91 |
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die |
| 92 |
fi |
| 93 |
} |
| 94 |
|
| 95 |
pkg_postinst() { |
| 96 |
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
| 97 |
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml |
| 98 |
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die |
| 99 |
fi |
| 100 |
|
| 101 |
use libvirtd || return 0 |
Archives