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
 }

Reply via email to