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 012C01382C5 for ; Thu, 11 Mar 2021 15:14:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34997E0C47; Thu, 11 Mar 2021 15:14:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1AEDDE0C47 for ; Thu, 11 Mar 2021 15:14:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 977D6340F26 for ; Thu, 11 Mar 2021 15:14:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03A81573 for ; Thu, 11 Mar 2021 15:14:35 +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: <1615475663.965a6ed9c1a235cf772e0af24aafdf78a6cfcf69.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-7.1.0.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 965a6ed9c1a235cf772e0af24aafdf78a6cfcf69 X-VCS-Branch: master Date: Thu, 11 Mar 2021 15:14:35 +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: 7cebf90c-df06-4d25-a15f-737c68d3e697 X-Archives-Hash: e6e92bb1badda0046599f3489179d77d commit: 965a6ed9c1a235cf772e0af24aafdf78a6cfcf69 Author: Matthias Maier gentoo org> AuthorDate: Thu Mar 11 15:07:29 2021 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Mar 11 15:14:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=965a6ed9 app-emulation/libvirt: remove rm clause Closes: https://bugs.gentoo.org/show_bug.cgi?id=775467 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Matthias Maier gentoo.org> app-emulation/libvirt/libvirt-7.1.0.ebuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app-emulation/libvirt/libvirt-7.1.0.ebuild b/app-emulation/libvirt/libvirt-7.1.0.ebuild index 41c7b927525..16755a56b8a 100644 --- a/app-emulation/libvirt/libvirt-7.1.0.ebuild +++ b/app-emulation/libvirt/libvirt-7.1.0.ebuild @@ -282,11 +282,15 @@ src_test() { src_install() { meson_src_install - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -r "${D}"/etc/sysconfig || die - rm -r "${D}"/var || die - rm -r "${D}"/run || die + # Depending on configuration option, libvirt will create some bogus + # directoreis. They are either not used, or libvirtd is able to create + # them on demand, so let's remove them. + # + # Note, we are using -f here so that rm does not fail or warn if the + # directory is nonexistent. + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + rm -rf "${D}"/run # Fix up doc paths for revisions if [[ $PV != $PVR ]]; then