From b4f5108d391b4a3b82e92ac9f270e42d323b9746 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Tue, 10 May 2016 09:58:08 -0400 Subject: [PATCH] Ignore godep version used to created Godep.json --- hack/verify-godeps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index fa35371e400..949d40082e5 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -95,7 +95,7 @@ git init > /dev/null 2>&1 hack/godep-save.sh # Test for diffs -if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-lines='^\s*\"Comment\":' ${KUBE_ROOT}/Godeps/Godeps.json ${_kubetmp}/Godeps/Godeps.json)"; then +if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\":' ${KUBE_ROOT}/Godeps/Godeps.json ${_kubetmp}/Godeps/Godeps.json)"; then echo "Your Godeps.json is different:" echo "${_out}" exit 1