Skip to content

Commit 94445b2

Browse files
committed
Put back the hack that was originally in place.
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
1 parent 9488696 commit 94445b2

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

hack/.vendor-helpers.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,13 @@ clean() {
118118
-path vendor/src/github.com/mattn/go-sqlite3/code
119119
)
120120

121+
# This package is required to build the Etcd client,
122+
# but Etcd hard codes a local Godep full path.
123+
# FIXME: fix_rewritten_imports fixes this problem in most platforms
124+
# but it fails in very small corner cases where it makes the vendor
125+
# script to remove this package.
126+
# See: https://github.com/docker/docker/issues/19231
127+
findArgs+=( -or -path vendor/src/github.com/ugorji/go/codec )
121128
for import in "${imports[@]}"; do
122129
[ "${#findArgs[@]}" -eq 0 ] || findArgs+=( -or )
123130
findArgs+=( -path "vendor/src/$import" )

0 commit comments

Comments
 (0)