From 75f164a619962df239c7dc8144ebec9c2d27e6c7 Mon Sep 17 00:00:00 2001 From: Nigel Kersten Date: Wed, 4 May 2011 15:22:43 -0700 Subject: (#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 --- lib/puppet/util/command_line.rb | 7 +------ 1 file changed, 1 insertion(+), 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 -- cgit