build.go (go1.19.src) | : | build.go (go1.19.1.src) | ||
---|---|---|---|---|
skipping to change at line 185 | skipping to change at line 185 | |||
} | } | |||
if m2 == nil { | if m2 == nil { | |||
return m1 | return m1 | |||
} | } | |||
if !m1.Checkable() { | if !m1.Checkable() { | |||
return m1 | return m1 | |||
} | } | |||
if !m2.Checkable() { | if !m2.Checkable() { | |||
return m2 | return m2 | |||
} | } | |||
merged := new(codehost.Origin) | ||||
*merged = *m1 // Clone to avoid overwriting fields in cached results. | ||||
if m2.TagSum != "" { | if m2.TagSum != "" { | |||
if m1.TagSum != "" && (m1.TagSum != m2.TagSum || m1.TagPrefix != m2.TagPrefix) { | if m1.TagSum != "" && (m1.TagSum != m2.TagSum || m1.TagPrefix != m2.TagPrefix) { | |||
m1.ClearCheckable() | merged.ClearCheckable() | |||
return m1 | return merged | |||
} | } | |||
m1.TagSum = m2.TagSum | merged.TagSum = m2.TagSum | |||
m1.TagPrefix = m2.TagPrefix | merged.TagPrefix = m2.TagPrefix | |||
} | } | |||
if m2.Hash != "" { | if m2.Hash != "" { | |||
if m1.Hash != "" && (m1.Hash != m2.Hash || m1.Ref != m2.Ref) { | if m1.Hash != "" && (m1.Hash != m2.Hash || m1.Ref != m2.Ref) { | |||
m1.ClearCheckable() | merged.ClearCheckable() | |||
return m1 | return merged | |||
} | } | |||
m1.Hash = m2.Hash | merged.Hash = m2.Hash | |||
m1.Ref = m2.Ref | merged.Ref = m2.Ref | |||
} | } | |||
return m1 | return merged | |||
} | } | |||
// addVersions fills in m.Versions with the list of known versions. | // addVersions fills in m.Versions with the list of known versions. | |||
// Excluded versions will be omitted. If listRetracted is false, retracted | // Excluded versions will be omitted. If listRetracted is false, retracted | |||
// versions will also be omitted. | // versions will also be omitted. | |||
func addVersions(ctx context.Context, m *modinfo.ModulePublic, listRetracted boo l) { | func addVersions(ctx context.Context, m *modinfo.ModulePublic, listRetracted boo l) { | |||
allowed := CheckAllowed | allowed := CheckAllowed | |||
if listRetracted { | if listRetracted { | |||
allowed = CheckExclusions | allowed = CheckExclusions | |||
} | } | |||
End of changes. 6 change blocks. | ||||
9 lines changed or deleted | 13 lines changed or added |