Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

gps: source: requirements tweak #1025

Merged
merged 3 commits into from
Aug 29, 2017
Merged

gps: source: requirements tweak #1025

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dbff68
gps: source: drop convertToRevision sourceHasLatestLocally sourceGate…
jmank88 Aug 17, 2017
53c97d1
Merge branch 'master' into source_require
jmank88 Aug 17, 2017
39bdf9e
revert sourceHasLatestVersionList check; fix superviser.do name
jmank88 Aug 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/gps/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ func (sg *sourceGateway) listPackages(ctx context.Context, pr ProjectRoot, v Ver
return pkgtree.PackageTree{}, err
}

err = sg.suprvsr.do(ctx, label, ctGetManifestAndLock, func(ctx context.Context) error {
err = sg.suprvsr.do(ctx, label, ctListPackages, func(ctx context.Context) error {
ptree, err = sg.src.listPackages(ctx, pr, r)
return err
})
Expand Down Expand Up @@ -402,7 +402,7 @@ func (sg *sourceGateway) convertToRevision(ctx context.Context, v Version) (Revi

// The version list is out of date; it's possible this version might
// show up after loading it.
_, err := sg.require(ctx, sourceIsSetUp|sourceHasLatestVersionList|sourceHasLatestLocally)
_, err := sg.require(ctx, sourceIsSetUp|sourceHasLatestVersionList)
if err != nil {
return "", err
}
Expand Down