diff options
| author | Filippo Valsorda <filippo@golang.org> | 2021-08-09 12:37:04 -0400 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2021-08-09 12:37:04 -0400 |
| commit | dd96ded6c86b8a38f49fa087b758455243a0f08c (patch) | |
| tree | f1a70c0194af60202025ad135d1ee903e20896c3 /src/cmd/go/internal/load/pkg.go | |
| parent | ddf078e08dc61f38e26f9969dd2a2151a8c73904 (diff) | |
| parent | acbe242f8a2cae8ef4749806291a37d23089b572 (diff) | |
| download | go-dev.boringcrypto.go1.15.tar.gz go-dev.boringcrypto.go1.15.zip | |
[dev.boringcrypto.go1.15] all: merge go1.15.15 into dev.boringcrypto.go1.15dev.boringcrypto.go1.15
Change-Id: I3b20c90322a0c0deec68a161b8fcbab9188fb6b2
Diffstat (limited to 'src/cmd/go/internal/load/pkg.go')
| -rw-r--r-- | src/cmd/go/internal/load/pkg.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go index ddbb3b9be0..3300ea7775 100644 --- a/src/cmd/go/internal/load/pkg.go +++ b/src/cmd/go/internal/load/pkg.go @@ -1286,6 +1286,11 @@ func reusePackage(p *Package, stk *ImportStack) *Package { Err: errors.New("import cycle not allowed"), IsImportCycle: true, } + } else if !p.Error.IsImportCycle { + // If the error is already set, but it does not indicate that + // we are in an import cycle, set IsImportCycle so that we don't + // end up stuck in a loop down the road. + p.Error.IsImportCycle = true } p.Incomplete = true } |