From d4079c5340c9cc7c8d3bbfdcde3a92bd9c84e27f Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Jun 17 2017 13:29:11 +0000 Subject: rpm -q acts strangely on copr EPEL6. Make sure it doesn't break the build. --- diff --git a/valgrind.spec b/valgrind.spec index 0cd04b5..ee9cb75 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -320,10 +320,12 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/valgrind/vgpreload*-%{valarch}-*so %check # Make sure some info about the system is in the build.log +# Add || true because rpm on copr EPEL6 acts weirdly and we don't want +# to break the build. uname -a -rpm -q glibc gcc %{?scl_prefix}binutils +rpm -q glibc gcc %{?scl_prefix}binutils || true %if %{run_full_regtest} -rpm -q %{?scl_prefix}gdb +rpm -q %{?scl_prefix}gdb || true %endif LD_SHOW_AUXV=1 /bin/true