From 94445b2fea906df1bedec40284591d752def18e2 Mon Sep 17 00:00:00 2001 From: Ken Cochrane Date: Thu, 10 Mar 2016 20:27:44 -0500 Subject: [PATCH] Put back the hack that was originally in place. Signed-off-by: Ken Cochrane --- hack/.vendor-helpers.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hack/.vendor-helpers.sh b/hack/.vendor-helpers.sh index a509f6e720..d07182b514 100755 --- a/hack/.vendor-helpers.sh +++ b/hack/.vendor-helpers.sh @@ -118,6 +118,13 @@ clean() { -path vendor/src/github.com/mattn/go-sqlite3/code ) + # This package is required to build the Etcd client, + # but Etcd hard codes a local Godep full path. + # FIXME: fix_rewritten_imports fixes this problem in most platforms + # but it fails in very small corner cases where it makes the vendor + # script to remove this package. + # See: https://github.com/docker/docker/issues/19231 + findArgs+=( -or -path vendor/src/github.com/ugorji/go/codec ) for import in "${imports[@]}"; do [ "${#findArgs[@]}" -eq 0 ] || findArgs+=( -or ) findArgs+=( -path "vendor/src/$import" )