diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-09-09 17:51:13 +0300 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-09-10 09:47:05 +0300 |
| commit | 9a1e6d15a31ec667b2ff9cf20e43b1daca61e004 (patch) | |
| tree | 1e5bfed58030989858820e3e2e1ceba0b46a31c2 /modules/collect.go | |
| parent | 84adecf97baa91ab18cb26812fa864b4451d3c5f (diff) | |
modules: Make ignoreVendor a glob pattern
Fixes #7642
Diffstat (limited to 'modules/collect.go')
| -rw-r--r-- | modules/collect.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/collect.go b/modules/collect.go index 0ac766fb9..f87ed2484 100644 --- a/modules/collect.go +++ b/modules/collect.go @@ -196,7 +196,8 @@ func (c *collector) initModules() error { gomods: goModules{}, } - if !c.ccfg.IgnoreVendor && c.isVendored(c.ccfg.WorkingDir) { + // If both these are true, we don't even need Go installed to build. + if c.ccfg.IgnoreVendor == nil && c.isVendored(c.ccfg.WorkingDir) { return nil } @@ -229,7 +230,7 @@ func (c *collector) add(owner *moduleAdapter, moduleImport Import, disabled bool modulePath := moduleImport.Path var realOwner Module = owner - if !c.ccfg.IgnoreVendor { + if !c.ccfg.shouldIgnoreVendor(modulePath) { if err := c.collectModulesTXT(owner); err != nil { return nil, err } |