diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 14:31:01 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 14:31:01 -0700 |
| commit | 82fb02ce27c95d8326335a8d52a9ab7e676fe8d3 (patch) | |
| tree | 6706dc7afa05bf4bbffb2ab7e616717fb6af0c86 /lib/puppet/util | |
| parent | 7f9c9e1089c4bc36d52fcdd9751de559c658bf8d (diff) | |
| parent | 704623cb95aacb0544609620994dc36f61a4b463 (diff) | |
| download | puppet-82fb02ce27c95d8326335a8d52a9ab7e676fe8d3.tar.gz puppet-82fb02ce27c95d8326335a8d52a9ab7e676fe8d3.tar.xz puppet-82fb02ce27c95d8326335a8d52a9ab7e676fe8d3.zip | |
Merge branch 'next'
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/command_line.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index 714d03f74..8190f8ac1 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -65,14 +65,9 @@ module Puppet # return to the caller. How strange we are. --daniel 2011-04-11 else unless subcommand_name.nil? then - puts "Error: Unknown Puppet subcommand #{subcommand_name}.\n" + 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 |