From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5BD1D138359 for ; Thu, 1 Oct 2020 23:47:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8104AE075F; Thu, 1 Oct 2020 23:47:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55A81E0806 for ; Thu, 1 Oct 2020 23:47:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E3A8340845 for ; Thu, 1 Oct 2020 23:47:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9389389 for ; Thu, 1 Oct 2020 23:47:03 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1601595992.b357d99e5031bdaea97c063d745f77e1161e73fe.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-6.7.0.ebuild app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: b357d99e5031bdaea97c063d745f77e1161e73fe X-VCS-Branch: master Date: Thu, 1 Oct 2020 23:47:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e016d978-b6c6-4947-a956-f6418e38e0dd X-Archives-Hash: cc11a4b007ae6add9760dd59b33face8 commit: b357d99e5031bdaea97c063d745f77e1161e73fe Author: Jonathan Davies protonmail com> AuthorDate: Sun Sep 27 09:48:47 2020 +0000 Commit: Matthias Maier gentoo 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 protonmail.com> Signed-off-by: Matthias Maier 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