1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Put back the hack that was originally in place.

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
This commit is contained in:
Ken Cochrane 2016-03-10 20:27:44 -05:00
parent 9488696814
commit 94445b2fea

View file

@ -118,6 +118,13 @@ clean() {
-path vendor/src/github.com/mattn/go-sqlite3/code -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 for import in "${imports[@]}"; do
[ "${#findArgs[@]}" -eq 0 ] || findArgs+=( -or ) [ "${#findArgs[@]}" -eq 0 ] || findArgs+=( -or )
findArgs+=( -path "vendor/src/$import" ) findArgs+=( -path "vendor/src/$import" )