Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-11-14 14:24:55 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-11-14 14:24:55 +0300
commit20ec9fa2bbd69dc47dfc9f1db40c954e08520071 (patch)
tree41e0cc9515ad823b8bb98ca4bb29b1f24f83bbcb /modules/collect.go
parent812688fc2f3e220ac35cad9f0445a2548f0cc603 (diff)
modules: Do not check for remote modules if main project is vendored
Fixes #6506
Diffstat (limited to 'modules/collect.go')
-rw-r--r--modules/collect.go11
1 files changed, 11 insertions, 0 deletions
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)