diff options
| author | Nigel Kersten <nigel@puppetlabs.com> | 2011-05-04 15:29:55 -0700 |
|---|---|---|
| committer | Nigel Kersten <nigel@puppetlabs.com> | 2011-05-04 15:29:55 -0700 |
| commit | d950921e0dffe3c2f5315e63d86881986d7e4041 (patch) | |
| tree | 46f8ac90127ed1d078f05b87cc7476672135df47 | |
| parent | 8a8e1981f2189ba0ae3942625e93f495671c20ee (diff) | |
| parent | 75f164a619962df239c7dc8144ebec9c2d27e6c7 (diff) | |
| download | puppet-d950921e0dffe3c2f5315e63d86881986d7e4041.tar.gz puppet-d950921e0dffe3c2f5315e63d86881986d7e4041.tar.xz puppet-d950921e0dffe3c2f5315e63d86881986d7e4041.zip | |
Merge branch 'tickets/2.7.x/7304' into 2.7.x
| -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 |