From ecac356933f5aacf8c06bb599dac2bf61aadee3b Mon Sep 17 00:00:00 2001
From: Matt Rickard <mrick@google.com>
Date: Tue, 25 Apr 2017 10:45:11 -0700
Subject: [PATCH] Fix godep-restore script with new gopath

* We should be calling the hack/godep-restore script in kubernetes
instead of the normal godep restore ./...

* There was a typo in the case where a user didn't already have the
kubernetes repo cloned.
---
 Godeps/Godeps.json           | 13 +++++++------
 hack/godeps/godep-restore.sh |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index f8b3a7290a..4e608c6d2d 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -722,12 +722,12 @@
 		},
 		{
 			"ImportPath": "github.com/docker/distribution/digest",
-			"Comment": "v2.4.0-rc.1-38-gcd27f17",
+			"Comment": "v2.4.0-rc.1-38-gcd27f179",
 			"Rev": "cd27f179f2c10c5d300e6d09025b538c475b0d51"
 		},
 		{
 			"ImportPath": "github.com/docker/distribution/reference",
-			"Comment": "v2.4.0-rc.1-38-gcd27f17",
+			"Comment": "v2.4.0-rc.1-38-gcd27f179",
 			"Rev": "cd27f179f2c10c5d300e6d09025b538c475b0d51"
 		},
 		{
@@ -1092,22 +1092,22 @@
 		},
 		{
 			"ImportPath": "github.com/gogo/protobuf/gogoproto",
-			"Comment": "v0.2-33-ge18d7aa",
+			"Comment": "v0.2-33-ge18d7aa8",
 			"Rev": "e18d7aa8f8c624c915db340349aad4c49b10d173"
 		},
 		{
 			"ImportPath": "github.com/gogo/protobuf/proto",
-			"Comment": "v0.2-33-ge18d7aa",
+			"Comment": "v0.2-33-ge18d7aa8",
 			"Rev": "e18d7aa8f8c624c915db340349aad4c49b10d173"
 		},
 		{
 			"ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/descriptor",
-			"Comment": "v0.2-33-ge18d7aa",
+			"Comment": "v0.2-33-ge18d7aa8",
 			"Rev": "e18d7aa8f8c624c915db340349aad4c49b10d173"
 		},
 		{
 			"ImportPath": "github.com/gogo/protobuf/sortkeys",
-			"Comment": "v0.2-33-ge18d7aa",
+			"Comment": "v0.2-33-ge18d7aa8",
 			"Rev": "e18d7aa8f8c624c915db340349aad4c49b10d173"
 		},
 		{
@@ -1793,6 +1793,7 @@
 		},
 		{
 			"ImportPath": "github.com/pelletier/go-buffruneio",
+			"Comment": "v0.1.0",
 			"Rev": "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d"
 		},
 		{
diff --git a/hack/godeps/godep-restore.sh b/hack/godeps/godep-restore.sh
index 33e29264d3..c82f72891f 100755
--- a/hack/godeps/godep-restore.sh
+++ b/hack/godeps/godep-restore.sh
@@ -27,14 +27,14 @@ godep::ensure_godep_version v79
 # We can't 'go get kubernetes' so this hack is here
 mkdir -p ${K8S_ORG_ROOT}
 if [ ! -d "${KUBE_ROOT}" ]; then
-  pushd ${#GOPATH} >/dev/null
+  pushd ${K8S_ORG_ROOT} >/dev/null
     git clone https://github.com/kubernetes/kubernetes.git
   popd >/dev/null
 fi
 
 pushd ${KUBE_ROOT} >/dev/null
   git checkout ${KUBE_VERSION}
-  godep restore ./...
+  ./hack/godep-restore.sh
 popd >/dev/null
 
 godep::sync_staging