From ac0021ada8d71e965f93dd950f5471ea8b7d106d Mon Sep 17 00:00:00 2001 From: David Calavera Date: Mon, 8 Feb 2016 18:00:34 -0500 Subject: [PATCH] Do not purge github.com/ugorji/go/codec from vendor. Signed-off-by: David Calavera Upstream-commit: d11a2c758a497500bba08495f218b8f242fafad3 Component: engine --- components/engine/hack/.vendor-helpers.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/components/engine/hack/.vendor-helpers.sh b/components/engine/hack/.vendor-helpers.sh index fcc745c4da..a90df0496c 100755 --- a/components/engine/hack/.vendor-helpers.sh +++ b/components/engine/hack/.vendor-helpers.sh @@ -117,10 +117,19 @@ clean() { # This directory contains only .c and .h files which are necessary -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" ) done + local IFS=$'\n' local prune=( $($find vendor -depth -type d -not '(' "${findArgs[@]}" ')') ) unset IFS