[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/

[Jason Zaman]

commit:     08f9e12847155ee345ceaf754d5b5c196527144f
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 04:02:48 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> 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
 }