mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-18 21:11:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

modules: Make ignoreVendor a glob pattern

Browse Source 
Fixes #7642
This commit is contained in:
Bjørn Erik Pedersen
2020-09-09 16:51:13 +02:00
parent 84adecf97b
commit 9a1e6d15a3
9 changed files with 124 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/collect.go
View File

@@ -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
}