Skip to content

K
k3s
Commit dc83a117 authored by Clayton Coleman's avatar Clayton Coleman
Browse files
Options

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

Do not dirname on the dependency file's path twice while generating types using codecgen.
parents 59cc9071 1511466b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
hack/update-codecgen.sh
View file @ dc83a117
...@@ -53,8 +53,7 @@ result="" ...@@ -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
......
hack/verify-codecgen.sh
View file @ dc83a117
...@@ -53,8 +53,7 @@ result="" ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment