Update verify-godeps.sh to actually work

The diff was incorrect. It was doing `diff -NIaupr`. And so diff was interpreting the argument to -I to be `aupr`. So it was not running recursively. The fix is not so simple because there is an intentionally broken symlink in one of the godeps. Which diff -r fails on by default. On linux there is an options to not dereference symlink and just make sure they point to the same thing. No so on OS X. So we have to exclude all files called "symlink". Which thankfully there is only one of.

Update verify-godeps.sh to actually work
6766b732 · Eric Paris · c95a7470 · 6766b732
Commit 6766b732 authored Sep 18, 2015 by Eric Paris
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 8 deletions

verify-godeps.sh hack/verify-godeps.sh +16 -8

No files found.
--- a/hack/verify-godeps.sh
+++ b/hack/verify-godeps.sh
@@ -70,7 +70,7 @@ preload-dep "github.com/prometheus" "client_golang" "692492e54b553a81013254cc1fb
 echo "Download finished"

 # copy the contents of your kube directory into the nice clean place
-_kubetmp="${_tmpdir}/src/k8s.io/"
+_kubetmp="${_tmpdir}/src/k8s.io"
 mkdir -p "${_kubetmp}"
 #should create ${_kubectmp}/kubernetes
 git archive --format=tar --prefix=kubernetes/ $(git write-tree) | (cd "${_kubetmp}" && tar xf -)
@@ -78,17 +78,25 @@ _kubetmp="${_kubetmp}/kubernetes"

 # destroy godeps in our COPY of the kube tree
 pushd "${_kubetmp}" > /dev/null
-rm -rf ./Godeps
+  rm -rf ./Godeps

-# for some reason the kube tree needs to be a git repo for the godep tool to run. Doesn't make sense
-git init > /dev/null 2>&1
+  # for some reason the kube tree needs to be a git repo for the godep tool to run. Doesn't make sense
+  git init > /dev/null 2>&1

-# recreate the Godeps using the nice clean set we just downloaded
-"${GODEP}" save ./...
+  # recreate the Godeps using the nice clean set we just downloaded
+  "${GODEP}" save -t ./...
 popd > /dev/null

-# Check for any (meaninful) differences between the godeps in the tree and this nice clean one we just built
-if ! _out="$(diff -NIaupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-lines='^\s*\"Comment\":' ${KUBE_ROOT}/Godeps/ ${_kubetmp}/Godeps/)"; then
+if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --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
+fi
+
+# Godeps/_workstapces/src/github.com/fsouza/go-dockerclient/testing/data/symlink'
+# is an intentionally broken symlink. Linux can use --no-dereference. OS X cannot.
+# So we --exclude='symlink' so diff -r doesn't die following a bad symlink.
+if ! _out="$(diff -Naupr --exclude='symlink' ${KUBE_ROOT}/Godeps/_workspace/src ${_kubetmp}/Godeps/_workspace/src)"; then
  echo "Your godeps changes are not reproducable"
  echo "${_out}"
  exit 1