Merge pull request #29920 from thockin/verify-godeps-results

Automatic merge from submit-queue Make verify-godeps check the results Verify the results of godep restore/save. When forced to run this finds a handful of real deltas that need to be resolved. Fixes #29402 @rmmh because you wrote #29571 which is the major culprit

Merge pull request #29920 from thockin/verify-godeps-results
0e55753d · Kubernetes Submit Queue · GitHub · 10b0f58f · b9d68ab5 · 0e55753d
Commit 0e55753d authored Aug 04, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 04, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

verify-godeps.sh hack/verify-godeps.sh +7 -0

No files found.
--- a/hack/verify-godeps.sh
+++ b/hack/verify-godeps.sh
@@ -104,5 +104,12 @@ if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-m
  exit 1
 fi

+if ! _out="$(diff -Naupr ${KUBE_ROOT}/vendor ${_kubetmp}/vendor)"; then
+  echo "Your vendored results are different:"
+  echo "${_out}"
+  echo "Godeps Verify failed."
+  exit 1
+fi
+
 echo "Godeps Verified."
 # ex: ts=2 sw=2 et filetype=sh