From 20ec9fa2bbd69dc47dfc9f1db40c954e08520071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Thu, 14 Nov 2019 12:24:55 +0100 Subject: modules: Do not check for remote modules if main project is vendored Fixes #6506 --- modules/collect.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'modules/collect.go') diff --git a/modules/collect.go b/modules/collect.go index 731a991b8..f5972a5b0 100644 --- a/modules/collect.go +++ b/modules/collect.go @@ -191,6 +191,11 @@ func (c *collector) initModules() error { c.collected = &collected{ seen: make(map[string]bool), vendored: make(map[string]vendoredModule), + gomods: goModules{}, + } + + if !c.ccfg.IgnoreVendor && c.isVendored(c.ccfg.WorkingDir) { + return nil } // We may fail later if we don't find the mods. @@ -463,6 +468,7 @@ func (c *collector) applyThemeConfig(tc *moduleAdapter) error { } func (c *collector) collect() { + if err := c.initModules(); err != nil { c.err = err return @@ -480,6 +486,11 @@ func (c *collector) collect() { } +func (c *collector) isVendored(dir string) bool { + _, err := c.fs.Stat(filepath.Join(dir, vendord, vendorModulesFilename)) + return err == nil +} + func (c *collector) collectModulesTXT(owner Module) error { vendorDir := filepath.Join(owner.Dir(), vendord) filename := filepath.Join(vendorDir, vendorModulesFilename) -- cgit v1.2.3