From 9e9a66ed22f6807c9a633f428c0bbcb6c42e11c1 Mon Sep 17 00:00:00 2001
From: saadali <saadali@google.com>
Date: Wed, 2 Nov 2016 23:49:30 -0700
Subject: [PATCH] Ensure verify-godep passes godep to godep-save

---
 hack/godep-save.sh    | 1 +
 hack/verify-godeps.sh | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hack/godep-save.sh b/hack/godep-save.sh
index 4663dd022d3..caae48cc1f2 100755
--- a/hack/godep-save.sh
+++ b/hack/godep-save.sh
@@ -34,6 +34,7 @@ REQUIRED_BINS=(
 )
 
 pushd "${KUBE_ROOT}" > /dev/null
+  "${GODEP}" version
   GO15VENDOREXPERIMENT=1 ${GODEP} save "${REQUIRED_BINS[@]}"
   # create a symlink in vendor directory pointing to the staging client. This
   # let other packages use the staging client as if it were vendored.
diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh
index 12bd9e57960..612cbf7fabb 100755
--- a/hack/verify-godeps.sh
+++ b/hack/verify-godeps.sh
@@ -60,6 +60,7 @@ function cleanup {
     echo "Removing ${_tmpdir}"
     rm -rf "${_tmpdir}"
   fi
+  export GODEP=""
 }
 trap cleanup EXIT
 
@@ -76,7 +77,7 @@ export GOPATH="${_tmpdir}"
 pushd "${_kubetmp}" 2>&1 > /dev/null
   # Build the godep tool
   go get -u github.com/tools/godep 2>/dev/null
-  GODEP="${GOPATH}/bin/godep"
+  export GODEP="${GOPATH}/bin/godep"
   pin-godep() {
     pushd "${GOPATH}/src/github.com/tools/godep" > /dev/null
       git checkout "$1"