Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Unified Diff: cipd/client/cipd/ensure/file.go

Issue 2657873002: [cipd] use new pin types in common (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cipd/client/cipd/client_test.go ('k') | cipd/client/cipd/ensure/good_test.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « cipd/client/cipd/client_test.go ('k') | cipd/client/cipd/ensure/good_test.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698