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

Unified Diff: cipd/client/cmd/cipd/main.go

Issue 2663473002: [cipd] Rename new Root terminology to Subdir. (Closed)
Patch Set: 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/ensure/item_parsers.go ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cipd/client/cmd/cipd/main.go
diff --git a/cipd/client/cmd/cipd/main.go b/cipd/client/cmd/cipd/main.go
index 2a9a7614f89e98806b8ed80fd4e56396f8a958e8..54b973d0b5670747ecb385fbfd805feaacc202f0 100644
--- a/cipd/client/cmd/cipd/main.go
+++ b/cipd/client/cmd/cipd/main.go
@@ -767,17 +767,17 @@ func ensurePackages(ctx context.Context, root string, desiredStateFile string, d
return nil, cipd.Actions{}, err
}
- baseRoot := resolved.PackagesByRoot[""]
- delete(resolved.PackagesByRoot, "")
- if len(resolved.PackagesByRoot) > 0 {
- return nil, cipd.Actions{}, errors.New("@Root not yet supported")
+ baseSubdir := resolved.PackagesBySubdir[""]
+ delete(resolved.PackagesBySubdir, "")
+ if len(resolved.PackagesBySubdir) > 0 {
+ return nil, cipd.Actions{}, errors.New("@Subdir not yet supported")
}
- actions, err := client.EnsurePackages(ctx, baseRoot, dryRun)
+ actions, err := client.EnsurePackages(ctx, baseSubdir, dryRun)
if err != nil {
return nil, actions, err
}
- return baseRoot, actions, nil
+ return baseSubdir, actions, nil
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « cipd/client/cipd/ensure/item_parsers.go ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698