From 26491cef818d1f3fffc0aef6237108cb75354c5a Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Tue, 23 May 2017 22:39:59 -0700 Subject: [PATCH] Simplify output of ensure_godep_version --- hack/lib/util.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/lib/util.sh b/hack/lib/util.sh index 80e5545a449..6424b1f1248 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -495,7 +495,7 @@ kube::util::ensure_clean_working_dir() { # Ensure that the given godep version is installed and in the path kube::util::ensure_godep_version() { GODEP_VERSION=${1:-"v79"} - if [[ "$(godep version)" == *"godep ${GODEP_VERSION}"* ]]; then + if [[ "$(godep version 2>/dev/null)" == *"godep ${GODEP_VERSION}"* ]]; then return fi @@ -504,7 +504,7 @@ kube::util::ensure_godep_version() { GOPATH="${KUBE_TEMP}/go" go get -d -u github.com/tools/godep 2>/dev/null pushd "${KUBE_TEMP}/go/src/github.com/tools/godep" >/dev/null - git checkout "${GODEP_VERSION}" + git checkout -q "${GODEP_VERSION}" GOPATH="${KUBE_TEMP}/go" go install . popd >/dev/null