From 2646b4c933e05705e2f9d7459e4abbf362bda6f9 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Tue, 15 Dec 2015 09:08:20 -0500
Subject: [PATCH 1/2] Revert "Pin godep to version 32"

This reverts commit 7d5acfb923bb6b0be42066b7496a9447228119db.

This was hopefully fixed in
https://github.com/tools/godep/pull/362
---
 hack/verify-godeps.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh
index 5144262922b..12fc78c81f5 100755
--- a/hack/verify-godeps.sh
+++ b/hack/verify-godeps.sh
@@ -18,9 +18,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-# Lock this to a release that is known to work.  We can bump this as needed.
-GODEP_RELEASE=v45
-
 #### HACK ####
 # Sometimes godep just can't handle things. This lets use manually put
 # some deps in place first, so godep won't fall over.
@@ -56,13 +53,10 @@ function cleanup {
 }
 trap cleanup EXIT
 
-export GOPATH="${_tmpdir}"
 # build the godep tool
+export GOPATH="${_tmpdir}"
 go get -u github.com/tools/godep 2>/dev/null
-pushd "${_tmpdir}/src/github.com/tools/godep" > /dev/null
-  git checkout "${GODEP_RELEASE}" 2>/dev/null
-  go install github.com/tools/godep 2>/dev/null
-popd > /dev/null
+go install github.com/tools/godep 2>/dev/null
 GODEP="${_tmpdir}/bin/godep"
 
 # fill out that nice clean place with the kube godeps

From 4034b5db24db847c879292fc02a3852b2d56ff99 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Tue, 5 Jan 2016 10:19:23 -0500
Subject: [PATCH 2/2] Stop needlessly preloading

---
 hack/verify-godeps.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh
index 12fc78c81f5..b98897c3d36 100755
--- a/hack/verify-godeps.sh
+++ b/hack/verify-godeps.sh
@@ -62,12 +62,6 @@ GODEP="${_tmpdir}/bin/godep"
 # fill out that nice clean place with the kube godeps
 echo "Starting to download all kubernetes godeps. This takes a while"
 
-# Remove once either godep works properly or we bump docker version
-preload-dep github.com/docker docker 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d
-
-# Remove once either godep works properly or we bump camlistore deps
-preload-dep github.com/camlistore camlistore 9868aa0f8d8a93ff0b30ff0de46cc351b6b88b30
-
 "${GODEP}" restore
 echo "Download finished"