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

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

View File

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

View File

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