From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6DE2F1384B4 for ; Wed, 9 Dec 2015 04:05:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B8A021C017; Wed, 9 Dec 2015 04:04:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9002D21C017 for ; Wed, 9 Dec 2015 04:04:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CB3533D3CF for ; Wed, 9 Dec 2015 04:04:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BE8EC6A for ; Wed, 9 Dec 2015 04:04:53 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1449633790.08f9e12847155ee345ceaf754d5b5c196527144f.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libselinux/libselinux-2.4.ebuild sys-libs/libselinux/libselinux-9999.ebuild X-VCS-Directories: sys-libs/libselinux/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 08f9e12847155ee345ceaf754d5b5c196527144f X-VCS-Branch: master Date: Wed, 9 Dec 2015 04:04:53 +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-Archives-Salt: 85a54690-70fb-40cb-bf3a-43309e1cd05d X-Archives-Hash: 8c08b549e8a48831c14dc29b5a3498ea commit: 08f9e12847155ee345ceaf754d5b5c196527144f Author: Jason Zaman gentoo org> AuthorDate: Wed Dec 9 04:02:48 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Wed Dec 9 04:03:10 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f9e128 sys-libs/libselinux: only recompile contexts if the files are installed During stage building, the fcontext files might not exist on the system yet Package-Manager: portage-2.2.24 sys-libs/libselinux/libselinux-2.4.ebuild | 5 ++++- sys-libs/libselinux/libselinux-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-libs/libselinux/libselinux-2.4.ebuild b/sys-libs/libselinux/libselinux-2.4.ebuild index 642336e..8f36614 100644 --- a/sys-libs/libselinux/libselinux-2.4.ebuild +++ b/sys-libs/libselinux/libselinux-2.4.ebuild @@ -136,7 +136,10 @@ pkg_postinst() { touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die # Fix bug 516608 for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do - sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile contexts" + if [[ -f ${EXPRFILE} ]]; then + sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ + || die "Failed to recompile contexts" + fi done done } diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild index 1f1d1d2..01b4776 100644 --- a/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sys-libs/libselinux/libselinux-9999.ebuild @@ -146,7 +146,10 @@ pkg_postinst() { touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die # Fix bug 516608 for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do - sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile contexts" + if [[ -f ${EXPRFILE} ]]; then + sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ + || die "Failed to recompile contexts" + fi done done }