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

… calls. Signed-off-by: Jonathan Davies <[email protected]> Signed-off-by: Matthias Maier <[email protected]>
johu · Oct 1, 2020 · b357d99 · b357d99
1 parent dd99766
commit b357d99
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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