github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

verify-godeps: change redirection order.

Browse Source 
In code "popd 2>&1 > /dev/null" the stderr output goes to the terminal
instead of /dev/null, which is clearly the intention. Change the order
to fix this in four places. Also, while at it, change one incorrect
comparison to use "-gt" instead of ">" in the same file.
This commit is contained in:
Ismo Puustinen 2018-02-02 11:53:17 +02:00
parent 6372bb2f28
commit 03b674bc86
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hack/verify-godeps.sh
View File

@ -65,7 +65,7 @@ _kubetmp="${_kubetmp}/kubernetes"
# Do all our work in the new GOPATH # Do all our work in the new GOPATH
export GOPATH="${_tmpdir}" export GOPATH="${_tmpdir}"
pushd "${_kubetmp}" 2>&1 > /dev/null pushd "${_kubetmp}" > /dev/null 2>&1
# Restore the Godeps into our temp directory # Restore the Godeps into our temp directory
hack/godep-restore.sh hack/godep-restore.sh
@ -78,11 +78,11 @@ pushd "${_kubetmp}" 2>&1 > /dev/null
# Recreate the Godeps using the nice clean set we just downloaded # Recreate the Godeps using the nice clean set we just downloaded
hack/godep-save.sh hack/godep-save.sh
popd 2>&1 > /dev/null popd > /dev/null 2>&1
ret=0 ret=0
pushd "${KUBE_ROOT}" 2>&1 > /dev/null pushd "${KUBE_ROOT}" > /dev/null 2>&1
# Test for diffs # Test for diffs
if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\":' Godeps/Godeps.json ${_kubetmp}/Godeps/Godeps.json)"; then if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\":' Godeps/Godeps.json ${_kubetmp}/Godeps/Godeps.json)"; then
echo "Your Godeps.json is different:" >&2 echo "Your Godeps.json is different:" >&2
@ -117,9 +117,9 @@ pushd "${KUBE_ROOT}" 2>&1 > /dev/null
fi fi
ret=1 ret=1
fi fi
popd 2>&1 > /dev/null popd > /dev/null 2>&1
if [[ ${ret} > 0 ]]; then if [[ ${ret} -gt 0 ]]; then
exit ${ret} exit ${ret}
fi fi