From a237b9cb6092dc59ac924b497b525fe989dcb32d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 11 Dec 2013 15:55:42 +0100 Subject: [PATCH] contrib/jenkins: update jenkins_script.sh Signed-off-by: Thomas Haller --- contrib/rh-jenkins/jenkins_script.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/rh-jenkins/jenkins_script.sh b/contrib/rh-jenkins/jenkins_script.sh index b59c7e369e..9b0f56a07c 100644 --- a/contrib/rh-jenkins/jenkins_script.sh +++ b/contrib/rh-jenkins/jenkins_script.sh @@ -41,8 +41,10 @@ trap "git_notes_fail; exit 1" ERR temporary_workaround_01() { # https://bugzilla.gnome.org/show_bug.cgi?id=705160 # otherwise current mem leaks check fail... - wget 'https://bugzilla.gnome.org/attachment.cgi?id=256245' -O valgrind.suppressions.patch - git apply valgrind.suppressions.patch + if [[ "$(git merge-base 2540966492340ad87cd5a894d544580b8e20c558 HEAD 2>/dev/null || true)" != "2540966492340ad87cd5a894d544580b8e20c558" ]]; then + wget 'https://bugzilla.gnome.org/attachment.cgi?id=256245' -O valgrind.suppressions.patch + git apply valgrind.suppressions.patch || true + fi } log_timestamp