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

Merge pull request #19768 from madhusudancs/fix-update-codecgen

Browse Source 
Do not dirname on the dependency file's path twice while generating types using codecgen.
This commit is contained in:
Clayton Coleman 2016-01-18 11:15:12 -05:00
commit dc83a11758
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/update-codecgen.sh
View File

@ -53,8 +53,7 @@ result=""
function depends { function depends {
file=${generated_files[$1]//\.generated\.go/.go} file=${generated_files[$1]//\.generated\.go/.go}
deps=$(go list -f "{{.Deps}}" ${file} | tr "[" " " | tr "]" " ") deps=$(go list -f "{{.Deps}}" ${file} | tr "[" " " | tr "]" " ")
fullpath=$(readlinkdashf "${generated_files[$2]//\.generated\.go/.go}") candidate=$(readlinkdashf "${generated_files[$2]//\.generated\.go/.go}")
candidate=$(dirname "${fullpath}")
result=false result=false
for dep in ${deps}; do for dep in ${deps}; do
if [[ ${candidate} = *${dep} ]]; then if [[ ${candidate} = *${dep} ]]; then

3
hack/verify-codecgen.sh
View File

@ -53,8 +53,7 @@ result=""
function depends { function depends {
file=${generated_files[$1]//\.generated\.go/.go} file=${generated_files[$1]//\.generated\.go/.go}
deps=$(go list -f "{{.Deps}}" ${file} | tr "[" " " | tr "]" " ") deps=$(go list -f "{{.Deps}}" ${file} | tr "[" " " | tr "]" " ")
fullpath=$(readlinkdashf "${generated_files[$2]//\.generated\.go/.go}") candidate=$(readlinkdashf "${generated_files[$2]//\.generated\.go/.go}")
candidate=$(dirname "${fullpath}")
result=false result=false
for dep in ${deps}; do for dep in ${deps}; do
if [[ ${candidate} = *${dep} ]]; then if [[ ${candidate} = *${dep} ]]; then