github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31913 from dims/fix-go-lint-on-mac

Browse Source 
Automatic merge from submit-queue

fix hack/verify-golint.sh on a Mac

Relax the location of the files a bit (Don't assume the
k8s.io/kubernetes always!)

Fixes #31905
This commit is contained in:
Kubernetes Submit Queue
2016-09-14 23:47:13 -07:00
committed by GitHub
parent 6946cce099 773e1c7f93
commit 43ff2edc16
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hack/verify-golint.sh
View File

@@ -51,8 +51,11 @@ if ! diff -u "${linted_file}" <(LANG=C sort "${linted_file}"); then
fi fi
export IFS=$'\n' export IFS=$'\n'
# NOTE: when "go list -e ./..." is run within GOPATH, it turns the k8s.io/kubernetes
# as the prefix, however if we run it outside it returns the full path of the file
# with a leading underscore. We'll need to support both scenarios for all_packages.
all_packages=( all_packages=(
$(go list -e ./... | egrep -v "/(third_party|vendor|staging|generated|clientset_generated)" | sed 's/k8s.io\/kubernetes\///g') $(go list -e ./... | egrep -v "/(third_party|vendor|staging|generated|clientset_generated)" | sed -e 's|^k8s.io/kubernetes/||' -e "s|^_${KUBE_ROOT}/\?||")
) )
linted_packages=( linted_packages=(
$(cat $linted_file) $(cat $linted_file)