shithub: hugo

Info  •  Files  •  Log  •  Branches

commands: Include theme name in version mismatch error

Fixes #5044

--- a/commands/commandeer.go

+++ b/commands/commandeer.go

@@ -17,6 +17,7 @@

 	"os"

 	"path/filepath"

 	"regexp"

+	"strings"

 	"sync"

 	"time"

@@ -324,11 +325,12 @@

 		}

 	}

-	themeVersionMismatch, minVersion := c.isThemeVsHugoVersionMismatch(sourceFs)

+	dir, themeVersionMismatch, minVersion := c.isThemeVsHugoVersionMismatch(sourceFs)

 	if themeVersionMismatch {

-		cfg.Logger.ERROR.Printf("Current theme does not support Hugo version %s. Minimum version required is %s\n",

-			helpers.CurrentHugoVersion.ReleaseVersion(), minVersion)

+		name := filepath.Base(dir)

+		cfg.Logger.ERROR.Printf("%s theme does not support Hugo version %s. Minimum version required is %s\n",

+			strings.ToUpper(name), helpers.CurrentHugoVersion.ReleaseVersion(), minVersion)

 	}

 	return nil

--- a/commands/hugo.go

+++ b/commands/hugo.go

@@ -945,7 +945,7 @@

 // isThemeVsHugoVersionMismatch returns whether the current Hugo version is

 // less than any of the themes' min_version.

-func (c *commandeer) isThemeVsHugoVersionMismatch(fs afero.Fs) (mismatch bool, requiredMinVersion string) {

+func (c *commandeer) isThemeVsHugoVersionMismatch(fs afero.Fs) (dir string, mismatch bool, requiredMinVersion string) {

 	if !c.hugo.PathSpec.ThemeSet() {

 		return

 	}

@@ -970,7 +970,7 @@

 		if minVersion, ok := tomlMeta["min_version"]; ok {

 			if helpers.CompareVersion(minVersion) > 0 {

-				return true, fmt.Sprint(minVersion)

+				return absThemeDir, true, fmt.Sprint(minVersion)

 			}

 		}