[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Nigel Kersten]

The following commit has been merged in the experimental branch:
commit 75f164a619962df239c7dc8144ebec9c2d27e6c7
Author: Nigel Kersten <nigel at puppetlabs.com>
Date:   Wed May 4 15:22:43 2011 -0700

    (#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 at puppetlabs.com>

diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb
index daf49e8..8190f8a 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
 

-- 
Puppet packaging for Debian