From 6b6387c1356a075a40b4f1ec165a3abf01006e97 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Fri, 12 Aug 2016 08:50:52 -0700 Subject: [PATCH] hack/vendor.sh: remove old hacks for etcd etcd uses standard vendoring now Signed-off-by: Alexander Morozov Upstream-commit: 6623a5342c7b982ebc630974490eac06792d0605 Component: engine --- components/engine/hack/.vendor-helpers.sh | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/components/engine/hack/.vendor-helpers.sh b/components/engine/hack/.vendor-helpers.sh index 82fe7b3b38..dea1024607 100755 --- a/components/engine/hack/.vendor-helpers.sh +++ b/components/engine/hack/.vendor-helpers.sh @@ -119,13 +119,6 @@ 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" ) @@ -152,13 +145,3 @@ clean() { echo done } - -# Fix up hard-coded imports that refer to Godeps paths so they'll work with our vendoring -fix_rewritten_imports () { - local pkg="$1" - local remove="${pkg}/Godeps/_workspace/src/" - local target="vendor/src/$pkg" - - echo "$pkg: fixing rewritten imports" - $find "$target" -name \*.go -exec sed -i'.orig' -e "s|\"${remove}|\"|g" {} \; -}