quentin/hugo-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

modules: Do not check for remote modules if main project is vendored

Browse source 
Fixes #6506
This commit is contained in:
Bjørn Erik Pedersen 2019-11-14 12:24:55 +01:00
parent 812688fc2f
commit 20ec9fa2bb
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/client_test.go
View file

@ -78,9 +78,9 @@ github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0 github.com/gohugoio/h
c.Assert(client.Vendor(), qt.IsNil) c.Assert(client.Vendor(), qt.IsNil)
graphb.Reset() graphb.Reset()
c.Assert(client.Graph(&graphb), qt.IsNil) c.Assert(client.Graph(&graphb), qt.IsNil)
expectVendored := `github.com/gohugoio/tests/hugo-modules-basic-test github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0+vendor expectVendored := `project github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0+vendor
github.com/gohugoio/tests/hugo-modules-basic-test github.com/gohugoio/hugoTestModules1_darwin/modh2_2_1v@v1.3.0+vendor project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_1v@v1.3.0+vendor
github.com/gohugoio/tests/hugo-modules-basic-test github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
` `
c.Assert(graphb.String(), qt.Equals, expectVendored) c.Assert(graphb.String(), qt.Equals, expectVendored)

11
modules/collect.go
View file

@ -191,6 +191,11 @@ func (c *collector) initModules() error {
c.collected = &collected{ c.collected = &collected{
seen: make(map[string]bool), seen: make(map[string]bool),
vendored: make(map[string]vendoredModule), 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. // 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() { func (c *collector) collect() {
if err := c.initModules(); err != nil { if err := c.initModules(); err != nil {
c.err = err c.err = err
return 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 { func (c *collector) collectModulesTXT(owner Module) error {
vendorDir := filepath.Join(owner.Dir(), vendord) vendorDir := filepath.Join(owner.Dir(), vendord)
filename := filepath.Join(vendorDir, vendorModulesFilename) filename := filepath.Join(vendorDir, vendorModulesFilename)