Skip to content

Commit

Permalink
Bump some deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
bep committed Mar 20, 2018
1 parent 84f4b73 commit b6798ee
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions commands/hugo.go
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,8 @@ func (c *commandeer) setValueFromFlag(flags *flag.FlagSet, key string) {
if _, deprecated := deprecatedFlags[strings.ToLower(key)]; deprecated {
msg := fmt.Sprintf(`Set "%s = true" in your config.toml.
If you need to set this configuration value from the command line, set it via an OS environment variable: "HUGO_%s=true hugo"`, key, strings.ToUpper(key))
// Remove in Hugo 0.37
helpers.Deprecated("hugo", "--"+key+" flag", msg, false)
// Remove in Hugo 0.38
helpers.Deprecated("hugo", "--"+key+" flag", msg, true)
}
f := flags.Lookup(key)
c.Set(key, f.Value.String())
Expand Down
4 changes: 2 additions & 2 deletions resource/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Some examples:
// "logo" will match logo.png. It returns nil of none found.
// In potential ambiguous situations, combine it with ByType.
func (r Resources) GetByPrefix(prefix string) Resource {
helpers.Deprecated("Resources", "GetByPrefix", prefixDeprecatedMsg, false)
helpers.Deprecated("Resources", "GetByPrefix", prefixDeprecatedMsg, true)
prefix = strings.ToLower(prefix)
for _, resource := range r {
if matchesPrefix(resource, prefix) {
Expand All @@ -129,7 +129,7 @@ func (r Resources) GetByPrefix(prefix string) Resource {
// ByPrefix gets all resources matching the given base filename prefix, e.g
// "logo" will match logo.png.
func (r Resources) ByPrefix(prefix string) Resources {
helpers.Deprecated("Resources", "ByPrefix", prefixDeprecatedMsg, false)
helpers.Deprecated("Resources", "ByPrefix", prefixDeprecatedMsg, true)
var matches Resources
prefix = strings.ToLower(prefix)
for _, resource := range r {
Expand Down
4 changes: 2 additions & 2 deletions source/fileInfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ func (fi *FileInfo) FileInfo() os.FileInfo {
}

func (fi *FileInfo) Bytes() []byte {
// Remove in Hugo 0.34
helpers.Deprecated("File", "Bytes", "", false)
// Remove in Hugo 0.38
helpers.Deprecated("File", "Bytes", "", true)
return []byte("")
}

Expand Down

0 comments on commit b6798ee

Please sign in to comment.