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.

Signed-off-by: Nigel Kersten <[email protected]>
---
Local-branch: tickets/2.7.x/7304
 lib/puppet/util/command_line.rb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb
index daf49e8..b022447 100644
--- a/lib/puppet/util/command_line.rb
+++ b/lib/puppet/util/command_line.rb
@@ -71,8 +71,7 @@ module Puppet
           # 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
 
-- 
1.7.4.1

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to