summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-05-20 15:44:22 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-05-20 15:44:22 -0500
commit7c3d0702d5f480da76f7f950fe565a4486e7c1fe (patch)
tree5a722b2c79a3690e203ffe93bfbd1556143b4492 /misc
parent28fb5e8695ce4638ab15757760bd943f5a49773a (diff)
downloadbcfg2-7c3d0702d5f480da76f7f950fe565a4486e7c1fe.tar.gz
bcfg2-7c3d0702d5f480da76f7f950fe565a4486e7c1fe.tar.bz2
bcfg2-7c3d0702d5f480da76f7f950fe565a4486e7c1fe.zip
bcfg2-selinux.spec: Fail silently when missing prerequisites
Previously, we were failing hard if build dependencies were not met. /bin/sed: can't read /usr/share/selinux/devel/policyhelp: No such file or directory This commit allows rpmbuild to fall through so that we can see the real problem. error: Failed build dependencies: /usr/share/selinux/devel/policyhelp is needed by bcfg2-selinux-1.3.1-1.noarch Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'misc')
-rw-r--r--misc/bcfg2-selinux.spec2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec
index 4c05f4959..9c5262dfd 100644
--- a/misc/bcfg2-selinux.spec
+++ b/misc/bcfg2-selinux.spec
@@ -3,7 +3,7 @@
%global pythonversion %{py_ver}
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?_initrddir: %global _initrddir %{_sysconfdir}/rc.d/init.d}
-%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
+%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null || echo 0.0.0)
%global selinux_types %(%{__awk} '/^#[[:space:]]*SELINUXTYPE=/,/^[^#]/ { if ($3 == "-") printf "%s ", $2 }' /etc/selinux/config 2>/dev/null)
%global selinux_variants %([ -z "%{selinux_types}" ] && echo mls strict targeted || echo %{selinux_types})