diff options
author | Albert Nigmatzianov <albertnigma@gmail.com> | 2017-05-24 10:51:48 +0200 |
---|---|---|
committer | Albert Nigmatzianov <albertnigma@gmail.com> | 2017-05-24 10:51:51 +0200 |
commit | 421a46947ab5c889185422c864a9abbb7d4e2e04 (patch) | |
tree | 5344c55773190ef94bec793fd564898c6490550b /commands/hugo.go | |
parent | 0a40cb43eaa88c18e94cc5ffdb65f9047ef6265c (diff) |
cmd: Replace flagChanged with pflag.FlagSet.Changed
Diffstat (limited to 'commands/hugo.go')
-rw-r--r-- | commands/hugo.go | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/commands/hugo.go b/commands/hugo.go index e6514a0e0..eaf75e329 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -467,15 +467,15 @@ func (c *commandeer) initializeFlags(cmd *cobra.Command) { } // Remove these in Hugo 0.23. - if flagChanged(cmd.Flags(), "disable404") { + if cmd.Flags().Changed("disable404") { helpers.Deprecated("command line", "--disable404", "Use --disableKinds=404", false) } - if flagChanged(cmd.Flags(), "disableRSS") { + if cmd.Flags().Changed("disableRSS") { helpers.Deprecated("command line", "--disableRSS", "Use --disableKinds=RSS", false) } - if flagChanged(cmd.Flags(), "disableSitemap") { + if cmd.Flags().Changed("disableSitemap") { helpers.Deprecated("command line", "--disableSitemap", "Use --disableKinds=sitemap", false) } @@ -489,20 +489,12 @@ func (c *commandeer) initializeFlags(cmd *cobra.Command) { } func (c *commandeer) setValueFromFlag(flags *flag.FlagSet, key string) { - if flagChanged(flags, key) { + if flags.Changed(key) { f := flags.Lookup(key) c.Set(key, f.Value.String()) } } -func flagChanged(flags *flag.FlagSet, key string) bool { - flag := flags.Lookup(key) - if flag == nil { - return false - } - return flag.Changed -} - func (c *commandeer) watchConfig() { v := c.Cfg.(*viper.Viper) v.WatchConfig() |