From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1162699-garchives=archives.gentoo.org@lists.gentoo.org>
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 CC9C8138350
for <garchives@archives.gentoo.org>; Fri, 17 Apr 2020 19:49:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 21194E086D;
Fri, 17 Apr 2020 19:49:05 +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 07A15E086D
for <gentoo-commits@lists.gentoo.org>; Fri, 17 Apr 2020 19:49:05 +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 169BF34EE13
for <gentoo-commits@lists.gentoo.org>; Fri, 17 Apr 2020 19:49:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AE65171
for <gentoo-commits@lists.gentoo.org>; Fri, 17 Apr 2020 19:49:02 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <1587152878.8533ec2bf691a3b11fafbd20a05aaa417c306f01.robbat2@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/iproute2/iproute2-5.6.0.ebuild
X-VCS-Directories: sys-apps/iproute2/
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: 8533ec2bf691a3b11fafbd20a05aaa417c306f01
X-VCS-Branch: master
Date: Fri, 17 Apr 2020 19:49:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: cac97899-df9f-4f98-8360-39abf4854d6d
X-Archives-Hash: acf1c0660bc4fd0cb52eaf4c874c6d75
commit: 8533ec2bf691a3b11fafbd20a05aaa417c306f01
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 19:39:33 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 19:47:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8533ec2b
sys-apps/iproute2: QAfix emptydir /var/lib/arpd (take 2)
Also cleanup parent directories as much as possible.
Closes: https://bugs.gentoo.org/647032
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-apps/iproute2/iproute2-5.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/iproute2-5.6.0.ebuild b/sys-apps/iproute2/iproute2-5.6.0.ebuild
index 7670dd448c2..622ac0d6894 100644
--- a/sys-apps/iproute2/iproute2-5.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.6.0.ebuild
@@ -159,6 +159,6 @@ src_install() {
dodir /usr/bin
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
elif [[ -d "${ED}"/var/lib/arpd ]]; then
- rmdir "${ED}"/var/lib/arpd || die
+ rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
fi
}