Skip to content

Commit bc69a84

Browse files
authored
Merge pull request #3504 from ActiveState/DX-3072
Fix nil pointer panic
2 parents 948ebeb + bfedd74 commit bc69a84

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

internal/assets/contents/shells/zshrc_global.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ export {{$K}}="{{$V}}:$PATH"
88
{{- else}}
99
export {{$K}}="{{$V}}"
1010
{{- end}}
11-
{{- end}}
11+
{{- end}}

pkg/buildplan/artifact.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,7 @@ func (a Artifacts) ToIDSlice() []strfmt.UUID {
124124
func (a Artifacts) ToNameMap() ArtifactNameMap {
125125
result := make(map[string]*Artifact, len(a))
126126
for _, a := range a {
127-
name := a.DisplayName
128-
if len(a.Ingredients) == 0 {
129-
name = a.Ingredients[0].Name
130-
}
131-
result[name] = a
127+
result[a.Name()] = a
132128
}
133129
return result
134130
}

0 commit comments

Comments
 (0)