github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #39045 from justinsb/hippocrazy 

Automatic merge from submit-queue (batch tested with PRs 35805, 36972, 39045)

Fix spelling in package naming linter error message

```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2016-12-20 14:52:48 -08:00 committed by GitHub
parent e9a8554cb9 ed1baf1db1
commit 4474263a26
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/verify-pkg-names.sh
View File

@ -27,8 +27,8 @@ kube::golang::verify_go_version
cd "${KUBE_ROOT}"
if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/*'; then
echo "!!! Some package aliase break go conventions."
echo "To fix these errors, do not use capitalizaed or underlined characters"
echo "!!! Some package aliases break go conventions."
echo "To fix these errors, do not use capitalized or underlined characters"
echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info."
exit 1
fi

4
hooks/pre-commit
View File

@ -65,8 +65,8 @@ echo "${reset}"
echo -ne "Checking for package aliases... "
if ! hack/verify-pkg-names.sh > /dev/null; then
echo "${red}ERROR!"
echo "Some package aliase break go conventions. To fix these errors, "
echo "do not use capitalizaed or underlined characters in pkg aliases. "
echo "Some package aliases break go conventions. To fix these errors, "
echo "do not use capitalized or underlined characters in pkg aliases. "
echo "Refer to https://blog.golang.org/package-names for more info."
exit_code=1
else