| Index: cipd/client/cipd/ensure/file.go
|
| diff --git a/cipd/client/cipd/ensure/file.go b/cipd/client/cipd/ensure/file.go
|
| index 5e3eab184f0464178f0d22abe8fa3575f6f17783..d083ecdb2ba6d6b9a9f3122a8aa92a5228c948e1 100644
|
| --- a/cipd/client/cipd/ensure/file.go
|
| +++ b/cipd/client/cipd/ensure/file.go
|
| @@ -113,7 +113,7 @@ func ParseFile(r io.Reader) (*File, error) {
|
| type ResolvedFile struct {
|
| ServiceURL string
|
|
|
| - PackagesByRoot map[string][]common.Pin
|
| + PackagesByRoot common.PinSliceByRoot
|
| }
|
|
|
| // Resolve takes the current unresolved File and expands all package templates
|
| @@ -144,7 +144,7 @@ func (f *File) ResolveWith(arch, plat string, rslv VersionResolver) (*ResolvedFi
|
| // root -> pkg -> orig_lineno
|
| resolvedPkgDupList := map[string]map[string]int{}
|
|
|
| - ret.PackagesByRoot = map[string][]common.Pin{}
|
| + ret.PackagesByRoot = common.PinSliceByRoot{}
|
| for root, pkgs := range f.PackagesByRoot {
|
| // double-check the root
|
| if err := common.ValidateRoot(root); err != nil {
|
|
|