diff options
| author | Nigel Kersten <nigel@puppetlabs.com> | 2011-05-04 15:22:43 -0700 |
|---|---|---|
| committer | Nigel Kersten <nigel@puppetlabs.com> | 2011-05-04 15:28:25 -0700 |
| commit | 75f164a619962df239c7dc8144ebec9c2d27e6c7 (patch) | |
| tree | 46f8ac90127ed1d078f05b87cc7476672135df47 /lib/puppet | |
| parent | 8a8e1981f2189ba0ae3942625e93f495671c20ee (diff) | |
| download | puppet-75f164a619962df239c7dc8144ebec9c2d27e6c7.tar.gz puppet-75f164a619962df239c7dc8144ebec9c2d27e6c7.tar.xz puppet-75f164a619962df239c7dc8144ebec9c2d27e6c7.zip | |
(#7304) Remove full puppet help output when subcommand cannot be found
In order to make the error message more visible to the user,
we tell them about the puppet help command but don't automatically run it,
so the error doesn't scroll off the screen.
Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/util/command_line.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index daf49e8de..8190f8ac1 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -67,12 +67,7 @@ module Puppet unless subcommand_name.nil? then puts "Error: Unknown Puppet subcommand '#{subcommand_name}'" end - - # Doing this at the top of the file is natural, but causes puppet.rb - # to load too early, which causes things to break. This is a nasty - # thing, found in #7065. --daniel 2011-04-11 - require 'puppet/face' - puts Puppet::Face[:help, :current].help + puts "See 'puppet help' for help on available puppet subcommands" end end |